[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-277-g4a3be46

[Chris B. <buc...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SFCB - Small Footprint CIM Broker".

The branch, master has been updated
       via  4a3be460fbc69e4c80f423da7657e43a43440e99 (commit)
      from  f76860014073e64611f5201e43d0214fd4b8c0cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4a3be460fbc69e4c80f423da7657e43a43440e99
Author: buccella <buc...@li...>
Date:   Tue Jun 12 17:45:06 2012 -0400

    [ 3533179 ] Double definition for union semun  in FreeBSD

-----------------------------------------------------------------------

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index a55966a..77205bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.c, cimcClientSfcbLocal.h:
 	[ 3534659 ] Match SfcbLocal to sfcc update
 
diff --git a/NEWS b/NEWS
index 2f2be6f..a0597f2 100644
--- a/NEWS
+++ b/NEWS
@@ -114,6 +114,7 @@ Bugs Fixed:
 - 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
 =================
diff --git a/contributions.txt b/contributions.txt
index 5eccc0a..c36b3ed 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -205,3 +205,7 @@ Zane Bitter, Red Hat
 --------------------
 03/28/2012 [ 3510458 ] Malformed XML response to GetProperty
 03/28/2012 [ 3510456 ] GetProperty calls not passing keys to providers
+
+PitRunner
+---------
+06/12/2012 [ 3533179 ] Double definition for union semun  in FreeBSD
diff --git a/msgqueue.h b/msgqueue.h
index 13fdd30..8acde18 100644
--- a/msgqueue.h
+++ b/msgqueue.h
@@ -45,7 +45,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;


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker