summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/ace/config-linux-common.h6
2 files changed, 10 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6907f4aeb48..c3b6a63f4bb 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 24 18:45:32 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/config-linux-common.h:
+ When ACE_LACKS_STROPTS_H not is defined we assume we have
+ strbut so we set ACE_HAS_STRBUF_T
+
Thu Apr 24 16:47:16 UTC 2008 Chad Elliott <elliott_c@ociweb.com>
* bin/tao_orb_tests.lst:
diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h
index 4163db7ea5c..a72c2e71345 100644
--- a/ACE/ace/config-linux-common.h
+++ b/ACE/ace/config-linux-common.h
@@ -324,8 +324,6 @@
// Although the scandir man page says otherwise, this setting is correct.
#define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR
-#define ACE_HAS_STRBUF_T
-
// A conflict appears when including both <ucontext.h> and
// <sys/procfs.h> with recent glibc headers.
//#define ACE_HAS_PROC_FS
@@ -370,6 +368,10 @@
# define ACE_LACKS_STROPTS_H
#endif
+#if !defined (ACE_LACKS_STROPTS_H)
+# define ACE_HAS_STRBUF_T
+#endif
+
#if defined (__ia64) || defined(__alpha) || defined (__x86_64__)
// On 64 bit platforms, the "long" type is 64-bits. Override the
// default 32-bit platform-specific format specifiers appropriately.