You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/01/22 22:00:14 UTC
svn commit: r498799 - in
/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix:
hyipcmutex.c hyshsem.h
Author: hindessm
Date: Mon Jan 22 13:00:13 2007
New Revision: 498799
URL: http://svn.apache.org/viewvc?view=rev&rev=498799
Log:
More consistent defines for inclusion of semun struct.
Modified:
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyipcmutex.c
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyshsem.h
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyipcmutex.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyipcmutex.c?view=diff&rev=498799&r1=498798&r2=498799
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyipcmutex.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyipcmutex.c Mon Jan 22 13:00:13 2007
@@ -40,6 +40,7 @@
#include <errno.h>
#include "hyport.h"
+#if defined(_SEM_SEMUN_UNDEFINED)
/* arg for semctl semaphore system calls. */
union semun
{
@@ -47,6 +48,7 @@
struct semid_ds *buf;
U_16 *array;
};
+#endif
#define CDEV_CURRENT_FUNCTION _prototypes_private
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyshsem.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyshsem.h?view=diff&rev=498799&r1=498798&r2=498799
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyshsem.h (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hyshsem.h Mon Jan 22 13:00:13 2007
@@ -19,9 +19,7 @@
#define hyshsem_h
#include <sys/types.h>
#include <errno.h>
-#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
-/* union semun is defined by including <sys/sem.h> */
-#else
+#if defined(_SEM_SEMUN_UNDEFINED)
/* according to X/OPEN we have to define it ourselves */
union semun
{