ChangeLogTag: Wed Jan 29 12:31:51 2003 Frank Hunleth <frank@hunleth.com>

6 files changed, 97 insertions, 234 deletions

diff --git a/ChangeLog b/ChangeLog
index 36b95abb7b3..857d3fa7b2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Wed Jan 29 12:31:51 2003  Frank Hunleth  <frank@hunleth.com>
+
+	* ace/config-openbsd.h:
+	* ace/config-openbsd-pthreads.h: Merged config files together and
+	  removed config-openbsd-pthreads.h like what was done for
+	  FreeBSD.
+
+	* include/makeinclude/platform_openbsd.GNU:
+	* include/makeinclude/platform_openbsd_pthreads.GNU:  Merged files
+	  together and removed platform_openbsd_pthreads.GNU like
+	  FreeBSD.  Also removed gratuitous link of -lstdc++.  g++ already
+	  does that for us.  Thanks to Craig Rodrigues' changelog entry.
+
 Wed Jan 29 11:47:29 2003  Steve Huston  <shuston@riverace.com>
 
         * ACEXML/tests/ContentHandler_Test.cpp: Fixed compile errors by
@@ -55,6 +68,7 @@ Sun Jan 26 16:42:23 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
           Don't set any BUILD_DLL defines in this file, the BUILD_DLL defines
           are set in the specific makefiles.
 
+>>>>>>> 4.4596
 Sat Jan 25 20:31:56 2003  Frank Hunleth  <frank@hunleth.com>
 
         * ace/config-openbsd.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 36b95abb7b3..857d3fa7b2b 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Wed Jan 29 12:31:51 2003  Frank Hunleth  <frank@hunleth.com>
+
+	* ace/config-openbsd.h:
+	* ace/config-openbsd-pthreads.h: Merged config files together and
+	  removed config-openbsd-pthreads.h like what was done for
+	  FreeBSD.
+
+	* include/makeinclude/platform_openbsd.GNU:
+	* include/makeinclude/platform_openbsd_pthreads.GNU:  Merged files
+	  together and removed platform_openbsd_pthreads.GNU like
+	  FreeBSD.  Also removed gratuitous link of -lstdc++.  g++ already
+	  does that for us.  Thanks to Craig Rodrigues' changelog entry.
+
 Wed Jan 29 11:47:29 2003  Steve Huston  <shuston@riverace.com>
 
         * ACEXML/tests/ContentHandler_Test.cpp: Fixed compile errors by
@@ -55,6 +68,7 @@ Sun Jan 26 16:42:23 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
           Don't set any BUILD_DLL defines in this file, the BUILD_DLL defines
           are set in the specific makefiles.
 
+>>>>>>> 4.4596
 Sat Jan 25 20:31:56 2003  Frank Hunleth  <frank@hunleth.com>
 
         * ace/config-openbsd.h:
diff --git a/ace/config-openbsd-pthread.h b/ace/config-openbsd-pthread.h
deleted file mode 100644
index 22ca7058cca..00000000000
--- a/ace/config-openbsd-pthread.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ***** This configuration file is still under testing. *****
-
-// The following configuration file is designed to work for OpenBSD
-// platforms using GNU C++ and the POSIX (pthread) threads package.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include "ace/pre.h"
-
-#if ! defined (__ACE_INLINE__)
-#define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-#define ACE_SIZEOF_LONG_DOUBLE 12
-
-#if defined (__GNUG__)
-# include "ace/config-g++-common.h"
-#endif /* __GNUG__ */
-
-// Platform specific directives
-// gcc defines __OpenBSD__ automatically for us.
-#if !defined (_THREAD_SAFE)
-#define _THREAD_SAFE
-#endif /* _THREAD_SAFE */
-
-// Check if pthreads and native exceptions are being used together.
-// This causes SEGVs to tbe thrown somewhat randomly for some
-// reason.  According to newsgroup postings, it appears to be an
-// OpenBSD or gcc bug.
-#if defined (ACE_USES_NATIVE_EXCEPTIONS)
-#error "OpenBSD pthreads and native exceptions currently do not work.  See OpenBSD bug #1750"
-#endif /* ACE_USES_NATIVE_EXCEPTIONS */
-
-#define ACE_HAS_GPERF
-
-/* Are the following true? */
-#define ACE_LACKS_GETPGID
-#define ACE_LACKS_SETPGID
-#define ACE_LACKS_SETREGID
-#define ACE_LACKS_SETREUID
-
-#define ACE_HAS_ALT_CUSERID
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-
-#define ACE_LACKS_RWLOCK_T
-#define ACE_HAS_SIG_MACROS
-#define ACE_HAS_CHARPTR_DL
-#define ACE_HAS_DIRENT
-#define ACE_USES_ASM_SYMBOL_IN_DLSYM
-
-#define ACE_LACKS_UCONTEXT_H
-
-
-// OpenBSD has sigwait defined
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_SIGINFO_T
-
-#define ACE_HAS_REENTRANT_FUNCTIONS
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS
-#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-#define ACE_HAS_SOCKLEN_T
-
-#define ACE_HAS_POLL
-
-// Use of <malloc.h> is deprecated.
-#define ACE_LACKS_MALLOC_H
-
-// NetBSD appears to have a sigset_t type.
-// #define ACE_LACKS_SIGSET
-
-// Platform supports POSIX timers via struct timespec.
-#define ACE_HAS_POSIX_TIME
-#define ACE_HAS_UALARM
-
-// Platform defines struct timespec but not timespec_t
-#define ACE_LACKS_TIMESPEC_T
-
-#define ACE_LACKS_SYSTIME_H
-
-#define ACE_LACKS_STRRECVFD
-
-#define ACE_HAS_SIN_LEN
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// OpenBSD supports the getifaddrs interface
-#define ACE_HAS_GETIFADDRS
-
-// Compiler/platform supports SVR4 signal typedef
-#define ACE_HAS_SVR4_SIGNAL_T
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Compiler/platform supports alloca().
-#define ACE_HAS_ALLOCA
-
-// Compiler/platform supports SVR4 dynamic linking semantics..
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-
-// Compiler/platform correctly calls init()/fini() for shared libraries.
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-// Explicit dynamic linking permits "lazy" symbol resolution
-#define ACE_HAS_RTLD_LAZY_V
-
-// platform supports POSIX O_NONBLOCK semantics
-#define ACE_HAS_POSIX_NONBLOCK
-
-// platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// Lacks perfect filtering, must bind group address.
-#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING
-# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
-#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */
-
-// Compiler/platform has <alloca.h>
-//#define ACE_HAS_ALLOCA_H
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-// Compiler/platform defines the sig_atomic_t typedef.
-#define ACE_HAS_SIG_ATOMIC_T
-
-// Compiler/platform supports sys_siglist array.
-// *** This refers to (_sys_siglist) instead of (sys_siglist)
-// #define ACE_HAS_SYS_SIGLIST
-
-// Compiler/platform defines a union semun for SysV shared memory.
-#define ACE_HAS_SEMUN
-
-// Compiler supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T
-
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
-// Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SOCKIO_H
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
-// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H
-
-// Compiler/platform supports SVR4 gettimeofday() prototype
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
-// #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
-
-//#define ACE_HAS_SIG_C_FUNC
-
-// OpenBSD's dlsym call segfaults when passed an invalid handle.
-// It seems as if most other OSs detect this and just report an
-// error.
-#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#define ACE_HAS_MSG
-#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#define ACE_HAS_NONCONST_MSGSND
-
-#define ACE_HAS_SIGWAIT
-
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-
-// Thread specific settings
-// Yes, we do have threads.
-#define ACE_HAS_THREADS
-// And they're even POSIX pthreads
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif /* ! ACE_MT_SAFE */
-#define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_STD
-//#define ACE_LACKS_SETSCHED
-//#define ACE_LACKS_PTHREAD_CANCEL
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
-//#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#define ACE_LACKS_CONDATTR_PSHARED
-#define ACE_LACKS_MUTEXATTR_PSHARED
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-#define ACE_HAS_DIRENT
-
-#define ACE_HAS_TERM_IOCTLS
-#define ACE_USES_NEW_TERMIOS_STRUCT
-#define TCGETS TIOCGETA
-#define TCSETS TIOCSETA
-
-// OpenBSD actually has the clearerr call, but it causes a
-// bogus compiler syntax error.
-#define ACE_LACKS_CLEARERR
-
-#define ACE_HAS_MKSTEMP
-
-#define ACE_HAS_SNPRINTF
-
-// OpenBSD supports IPv6 by default, but ACE IPv6 code
-// has compile errors.
-//#define ACE_HAS_IPV6
-
-#include "ace/post.h"
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-openbsd.h b/ace/config-openbsd.h
index 6dc428e13cf..8738398669b 100644
--- a/ace/config-openbsd.h
+++ b/ace/config-openbsd.h
@@ -1,8 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-// ***** This configuration file is still under testing. *****
-
 // The following configuration file is designed to work for OpenBSD
 // platforms using GNU g++.
 
@@ -10,6 +8,12 @@
 #define ACE_CONFIG_H
 #include "ace/pre.h"
 
+#if defined (ACE_HAS_THREADS)
+#include /**/ <pthread.h>
+#endif /* ACE_HAS_THREADS */
+
+#include "ace/config-posix.h"
+
 #if ! defined (__ACE_INLINE__)
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
@@ -20,13 +24,36 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
+
+// Platform specific directives
+// gcc defines __OpenBSD__ automatically for us.
+#if defined (ACE_HAS_THREADS)
+#if !defined (_THREAD_SAFE)
+#define _THREAD_SAFE
+#endif /* _THREAD_SAFE */
+
+// Check if pthreads and native exceptions are being used together.
+// This causes SEGVs to tbe thrown somewhat randomly for some
+// reason.  According to newsgroup postings, it appears to be an
+// OpenBSD or gcc bug.
+#if defined (ACE_USES_NATIVE_EXCEPTIONS)
+#error "OpenBSD pthreads and native exceptions currently do not work.  See OpenBSD bug #1750"
+#endif /* ACE_USES_NATIVE_EXCEPTIONS */
+
+#endif /* ACE_HAS_THREADS */
+
 #define ACE_HAS_GPERF
 
 // Platform specific directives
+/* Are the following true? */
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_SETPGID
 #define ACE_LACKS_SETREGID
 #define ACE_LACKS_SETREUID
+
+#define ACE_HAS_ALT_CUSERID
+#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+
 #define ACE_LACKS_RWLOCK_T
 #define ACE_HAS_SIG_MACROS
 #define ACE_HAS_CHARPTR_DL
@@ -40,6 +67,12 @@
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIGINFO_T
 
+#define ACE_HAS_REENTRANT_FUNCTIONS
+#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
+#define ACE_LACKS_PWD_REENTRANT_FUNCTIONS
+#define ACE_LACKS_RAND_REENTRANT_FUNCTIONS
+#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+
 #define ACE_HAS_SOCKLEN_T
 
 #define ACE_HAS_POLL
@@ -149,13 +182,36 @@
 #define ACE_HAS_MSG
 #define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
 #define ACE_HAS_NONCONST_MSGSND
-#define ACE_HAS_ALT_CUSERID
+
+#ifdef ACE_HAS_THREADS
+// Thread specific settings
+
+// And they're even POSIX pthreads
+#if !defined (ACE_MT_SAFE)
+# define ACE_MT_SAFE 1
+#endif /* ! ACE_MT_SAFE */
+#endif /* ACE_HAS_THREADS */
 
 #define ACE_HAS_SIGWAIT
 
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_NONCONST_SELECT_TIMEVAL
+#define ACE_LACKS_THREAD_PROCESS_SCOPING
+#define ACE_LACKS_CONDATTR_PSHARED
+#define ACE_LACKS_MUTEXATTR_PSHARED
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+#define ACE_HAS_DIRENT
+
+#if !defined (ACE_HAS_THREADS)
+// OpenBSD really has readdir_r () in single threaded mode,
+// but the #ifdefs in OS.i select one with the wrong parameter
+// sets if the ACE_HAS_POSIX_STD isn't defined (which is defined
+// when ACE_HAS_THREADS is defined.)
+
+#define ACE_LACKS_READDIR_R
+
+#endif /* ! ACE_HAD_THREADS */
 
 #define ACE_HAS_TERM_IOCTLS
 #define ACE_USES_NEW_TERMIOS_STRUCT
diff --git a/include/makeinclude/platform_openbsd.GNU b/include/makeinclude/platform_openbsd.GNU
index 2922bdbaf9e..364a3c8a741 100644
--- a/include/makeinclude/platform_openbsd.GNU
+++ b/include/makeinclude/platform_openbsd.GNU
@@ -2,9 +2,6 @@
 
 # platform_openbsd.GNU
 
-# ***** Notice: This file is still under testing. *****
-# To be used on an OpenBSD platform without pthread support.
-
 versioned_so = 1
 
 ifndef exceptions
@@ -19,6 +16,10 @@ ifeq (,$(optimize))
   optimize = 1
 endif
 
+ifeq (,$(threads))
+  threads = 1
+endif
+
 CC              = gcc
 CXX		= g++
 
@@ -35,7 +36,7 @@ DCFLAGS         += -g
 LDFLAGS		+= -Wl,-rpath $(ACE_ROOT)/ace
 DLD             = $(CXX)
 LD		= $(CXX)
-LIBS            += -lstdc++
+LIBS            +=
 OCFLAGS         += -O2
 PIC             = -fpic
 AR              = ar
@@ -46,3 +47,8 @@ RANLIB          = ranlib
 SOFLAGS += $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so  $<
 PRELIB = @echo
+
+ifeq ($(threads),1)
+LDFLAGS         += -pthread
+CFLAGS          += -D_THREAD_SAFE -DACE_HAS_THREADS
+endif # threads
diff --git a/include/makeinclude/platform_openbsd_pthread.GNU b/include/makeinclude/platform_openbsd_pthread.GNU
deleted file mode 100644
index 5a297431549..00000000000
--- a/include/makeinclude/platform_openbsd_pthread.GNU
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-
-# platform_openbsd_pthread.GNU
-
-include $(ACE_ROOT)/include/makeinclude/platform_openbsd.GNU
-
-LDFLAGS		+= -pthread
-CFLAGS          += -D_THREAD_SAFE