diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-07-19 18:22:49 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-07-19 18:22:49 +0000 |
| commit | 10d279d3172a275f5f53fb18d4a0945f589a7224 (patch) | |
| tree | ef79d2d95b8df4528e606aaafb0c72f968ed0ac0 | |
| parent | 09919f10057cbbd823c745ef55987cf516d8c533 (diff) | |
| download | ATCD-10d279d3172a275f5f53fb18d4a0945f589a7224.tar.gz | |
Tue Jul 19 18:22:23 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* ace/config-android.h:
* ace/os_include/os_stropts.h:
* ace/os_include/sys/os_sem.h:
* ace/os_include/sys/os_shm.h:
Got rid of ACE_HAS_ANDROID.
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/config-android.h | 4 | ||||
| -rw-r--r-- | ACE/ace/os_include/os_stropts.h | 4 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_sem.h | 2 | ||||
| -rw-r--r-- | ACE/ace/os_include/sys/os_shm.h | 2 |
5 files changed, 13 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 43bf3f08d1f..2e433750354 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Tue Jul 19 18:22:23 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * ace/config-android.h: + * ace/os_include/os_stropts.h: + * ace/os_include/sys/os_sem.h: + * ace/os_include/sys/os_shm.h: + + Got rid of ACE_HAS_ANDROID. + Tue Jul 19 18:01:43 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * ace/OS_NS_errno.h: diff --git a/ACE/ace/config-android.h b/ACE/ace/config-android.h index a9bad1fbe31..c17f1f36807 100644 --- a/ACE/ace/config-android.h +++ b/ACE/ace/config-android.h @@ -2,7 +2,6 @@ #ifndef ACE_CONFIG_ANDROID_H #define ACE_CONFIG_ANDROID_H -#define ACE_HAS_ANDROID #define ACE_HAS_NET_IF_DL_H #define ACE_SIZEOF_LONG_DOUBLE 8 #define ACE_LACKS_UCONTEXT_H @@ -30,7 +29,8 @@ #define ACE_LACKS_WCSTOLL #define ACE_LACKS_WCSTOULL #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS - +#define ACE_HAS_LINUX_SEM_H +#define ACE_HAS_LINUX_SHM_H // I'm not sure if this is correct #define ACE_LACKS_RWLOCK_T diff --git a/ACE/ace/os_include/os_stropts.h b/ACE/ace/os_include/os_stropts.h index 0e1658cfcbd..b840c47b2e6 100644 --- a/ACE/ace/os_include/os_stropts.h +++ b/ACE/ace/os_include/os_stropts.h @@ -71,10 +71,6 @@ # include /**/ <ioLib.h> #endif /* ACE_VXWORKS */ -#if defined (ACE_HAS_ANDROID) -#include <sys/socket.h> -#endif - // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus extern "C" diff --git a/ACE/ace/os_include/sys/os_sem.h b/ACE/ace/os_include/sys/os_sem.h index 5553f8d6afb..77893f8cfd0 100644 --- a/ACE/ace/os_include/sys/os_sem.h +++ b/ACE/ace/os_include/sys/os_sem.h @@ -30,7 +30,7 @@ # include /**/ <sys/sem.h> #endif /* !ACE_LACKS_SYS_SEM_H */ -#if defined (ACE_HAS_ANDROID) +#if defined (ACE_HAS_LINUX_SEM_H) # include <linux/sem.h> #endif diff --git a/ACE/ace/os_include/sys/os_shm.h b/ACE/ace/os_include/sys/os_shm.h index f5a3fd61d7a..758afd484a0 100644 --- a/ACE/ace/os_include/sys/os_shm.h +++ b/ACE/ace/os_include/sys/os_shm.h @@ -30,7 +30,7 @@ # include /**/ <sys/shm.h> #endif /* !ACE_LACKS_SYS_SHM_H */ -#if defined (ACE_HAS_ANDROID) && defined (ACE_LACKS_SYS_SHM_H) +#if defined (ACE_HAS_LINUX_SHM_H) #include <linux/shm.h> #endif |