|
From: Chris B. <buc...@us...> - 2012-06-12 21:48:39
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv13596
Modified Files:
msgqueue.h ChangeLog NEWS
Log Message:
[ 3533179 ] Double definition for union semun in FreeBSD
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.695
retrieving revision 1.696
diff -u -d -r1.695 -r1.696
--- NEWS 12 Jun 2012 19:12:57 -0000 1.695
+++ NEWS 12 Jun 2012 21:48:36 -0000 1.696
@@ -25,6 +25,7 @@
- 3529856 httpProcs limit can be broken
- 3527620 EnumerateClasses does not include qualifiers by default
- 3532951 Filter creation fails with disable default properties
+- 3533179 Double definition for union semun in FreeBSD
Changes in 1.3.14
=================
Index: msgqueue.h
===================================================================
RCS file: /cvsroot/sblim/sfcb/msgqueue.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- msgqueue.h 29 Mar 2010 23:42:31 -0000 1.12
+++ msgqueue.h 12 Jun 2012 21:48:36 -0000 1.13
@@ -46,7 +46,8 @@
#define MSG_X_LOCAL 9
#define MSG_X_SFCB_PROVIDER 10
-#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
+#if defined(__FreeBSD__) || \
+ defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
#else
union semun {
int val;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -d -r1.777 -r1.778
--- ChangeLog 12 Jun 2012 19:12:57 -0000 1.777
+++ ChangeLog 12 Jun 2012 21:48:36 -0000 1.778
@@ -1,5 +1,9 @@
2012-06-12 Chris Buccella <buc...@li...>
+ * msgqueue.h:
+ [ 3533179 ] Double definition for union semun in FreeBSD
+ (patch by PitRunner)
+
* cimcClientSfcbLocal.h, cimcClientSfcbLocal.c:
[ 3534659 ] Match SfcbLocal to sfcc update
|