summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Savia <ops@iki.fi>2014-12-17 09:06:50 +0200
committerOlli Savia <ops@iki.fi>2014-12-17 09:06:50 +0200
commita1a4acc39718d72254b3320999a6535a1c669bec (patch)
tree6717925b2995dd5374f919c6f649c07c948fe413
parent7f5ad4ddd9637748db68f1d26f7853c192f24322 (diff)
downloadATCD-a1a4acc39718d72254b3320999a6535a1c669bec.tar.gz
Updated for OpenBSD 5.6
-rw-r--r--ACE/ace/config-openbsd.h14
-rw-r--r--ACE/include/makeinclude/platform_openbsd.GNU8
2 files changed, 7 insertions, 15 deletions
diff --git a/ACE/ace/config-openbsd.h b/ACE/ace/config-openbsd.h
index 6926bbb182c..25b9bcbf60a 100644
--- a/ACE/ace/config-openbsd.h
+++ b/ACE/ace/config-openbsd.h
@@ -43,21 +43,16 @@
#define ACE_HAS_MSG
#define ACE_HAS_NANOSLEEP
#define ACE_HAS_NEW_NO_H
-#define ACE_HAS_NONCONST_MSGSND
#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-#define ACE_HAS_NONCONST_SWAB
#define ACE_HAS_POLL
#define ACE_HAS_POSIX_NONBLOCK
#define ACE_HAS_POSIX_TIME
#define ACE_HAS_PTHREADS_UNIX98_EXT
-#define ACE_HAS_PTHREAD_ATTR_SETCREATESUSPEND_NP
#define ACE_HAS_PTHREAD_GETCONCURRENCY
#define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP
#define ACE_HAS_PTHREAD_NP_H
-#define ACE_HAS_PTHREAD_RESUME_NP
#define ACE_HAS_PTHREAD_SETCONCURRENCY
#define ACE_HAS_PTHREAD_SIGMASK_PROTOTYPE
-#define ACE_HAS_PTHREAD_SUSPEND_NP
#define ACE_HAS_P_READ_WRITE
#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
#define ACE_HAS_REENTRANT_FUNCTIONS
@@ -97,22 +92,19 @@
#define ACE_HAS_XPG4_MULTIBYTE_CHAR
#define ACE_HAS_SYS_SIGINFO_H
+#define ACE_LACKS_CONDATTR_PSHARED
#define ACE_LACKS_GETIPNODEBYADDR
#define ACE_LACKS_GETIPNODEBYNAME
#define ACE_LACKS_ISCTYPE
-#define ACE_LACKS_ISWASCII
+#define ACE_LACKS_MUTEXATTR_PSHARED
#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#define ACE_LACKS_PERFECT_MULTICAST_FILTERING
#define ACE_LACKS_SETSCHED
#define ACE_LACKS_STROPTS_H
#define ACE_LACKS_STRRECVFD
#define ACE_LACKS_TIMESPEC_T
#define ACE_LACKS_UCONTEXT_H
-#define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS
#define ACE_PAGE_SIZE 4096
-#define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR
-#define ACE_SCANDIR_SEL_LACKS_CONST
// OpenBSD 3.6
#if (OpenBSD < 200411)
@@ -126,7 +118,7 @@
// Lacks perfect filtering, must bind group address.
#if !defined ACE_LACKS_PERFECT_MULTICAST_FILTERING
-# define ACE_LACKS_PERFECT_MULTICAST_FILTERING
+# define ACE_LACKS_PERFECT_MULTICAST_FILTERING 1
#endif /* ACE_LACKS_PERFECT_MULTICAST_FILTERING */
// OpenBSD's dlsym call segfaults when passed an invalid handle.
diff --git a/ACE/include/makeinclude/platform_openbsd.GNU b/ACE/include/makeinclude/platform_openbsd.GNU
index 3ce7630d2c9..abf21e3dadc 100644
--- a/ACE/include/makeinclude/platform_openbsd.GNU
+++ b/ACE/include/makeinclude/platform_openbsd.GNU
@@ -55,12 +55,12 @@ PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox
PLATFORM_FOX_LIBS ?= -lFOX
PLATFORM_FOX_LDFLAGS ?=
-PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC) $(PLATFORM_X11_CPPFLAGS)
-PLATFORM_TK_LIBS=$(shell . /usr/local/lib/tk*/tkConfig.sh && echo -n $$TK_LIB_FLAG) $(PLATFORM_X11_LIBS)
+PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tcl/tk*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC) $(PLATFORM_X11_CPPFLAGS)
+PLATFORM_TK_LIBS=$(shell . /usr/local/lib/tcl/tk*/tkConfig.sh && echo -n $$TK_LIB_FLAG) $(PLATFORM_X11_LIBS)
PLATFORM_TK_LDFLAGS=$(PLATFORM_X11_LDFLAGS)
-PLATFORM_TCL_CPPFLAGS=$(shell . /usr/local/lib/tcl*/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC)
-PLATFORM_TCL_LIBS=$(shell . /usr/local/lib/tcl*/tclConfig.sh && echo -n $$TCL_LIB_FLAG)
+PLATFORM_TCL_CPPFLAGS=$(shell . /usr/local/lib/tcl/tcl*/tclConfig.sh && echo -n $$TCL_INCLUDE_SPEC)
+PLATFORM_TCL_LIBS=$(shell . /usr/local/lib/tcl/tcl*/tclConfig.sh && echo -n $$TCL_LIB_FLAG)
PLATFORM_TCL_LDFLAGS=
# Test for template instantiation, add to versioned_so if versioned_so set,