diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-03-03 01:08:10 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-03-03 01:08:10 +0000 |
| commit | c7c78b1b94cfd61d7a58c4d3a49b97f719e3716d (patch) | |
| tree | bdb2fb834aebc257bfde0add6e4c965194838136 | |
| parent | caa0581d42e1adfc5006d5c9e367470eb72f5e2c (diff) | |
| download | ATCD-c7c78b1b94cfd61d7a58c4d3a49b97f719e3716d.tar.gz | |
foo
23 files changed, 72 insertions, 14 deletions
diff --git a/ACE-install.sh b/ACE-install.sh index 538d5d69af7..2adda42c357 100644 --- a/ACE-install.sh +++ b/ACE-install.sh @@ -146,8 +146,13 @@ if [ ${AUTO} -eq 1 ] then if [ $1 != "auto" ] then - echo "$USAGE" - exit 2 + if [ $1 = "nounzip" ] ; then + UNZIP=0 + AUTO=0 + else + echo "$USAGE" + exit 2 + fi fi fi diff --git a/ChangeLog-97a b/ChangeLog-97a index 8db9a7c1972..0d36c621e05 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -1,3 +1,14 @@ +Sun Mar 2 17:14:29 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * include/makeinclude: Updated all the platform-*g++.GNU files so + that they no longer -D__ACE_INLINE__ (since this is handled in + the the config-*g++.h files). + + * ace: Updated all the config-*g++.h files so that they now + #define __ACE_INLINE__ rather than having this set in the + platform_*.GNU file. This makes ACE easier to build and + integrate with other software packages. + Fri Feb 28 02:22:33 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/SOCK_*: There were problems starting UDP broadcast servers diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h index db436dd630b..a3dc970ef65 100644 --- a/ace/config-linux-lxpthreads.h +++ b/ace/config-linux-lxpthreads.h @@ -31,6 +31,12 @@ #define ACE_HAS_PENTIUM #define ACE_HAS_LONGLONG +#define __ACE_INLINE__ + +#if defined (__ACE_INLINE__) +#define ACE_HAS_INLINED_OSCALLS +#endif /* __ACE_INLINE__ */ + // Fixes a problem with new versions of Linux... #ifndef msg_accrights #undef msg_control diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h index 9de25cd9a0e..206008b2b7b 100644 --- a/ace/config-linux-pthread.h +++ b/ace/config-linux-pthread.h @@ -10,6 +10,12 @@ #define ACE_HAS_PENTIUM #define ACE_HAS_LONGLONG +#define __ACE_INLINE__ + +#if defined (__ACE_INLINE__) +#define ACE_HAS_INLINED_OSCALLS +#endif /* __ACE_INLINE__ */ + // Fixes a problem with new versions of Linux... #ifndef msg_accrights #undef msg_control diff --git a/ace/config-linux.h b/ace/config-linux.h index 583fd14cd4a..183dbc69fb5 100644 --- a/ace/config-linux.h +++ b/ace/config-linux.h @@ -10,6 +10,12 @@ // Do we really need this #define here? #define LINUX 1.2.10 +#define __ACE_INLINE__ + +#if defined (__ACE_INLINE__) +#define ACE_HAS_INLINED_OSCALLS +#endif /* __ACE_INLINE__ */ + #define ACE_HAS_PENTIUM #define ACE_HAS_LONGLONG diff --git a/ace/config-osf1-4.0-g++.h b/ace/config-osf1-4.0-g++.h index 320188d46ef..55244809670 100644 --- a/ace/config-osf1-4.0-g++.h +++ b/ace/config-osf1-4.0-g++.h @@ -9,6 +9,12 @@ #if !defined (ACE_CONFIG_H) #define ACE_CONFIG_H +#define __ACE_INLINE__ + +#if defined (__ACE_INLINE__) +#define ACE_HAS_INLINED_OSCALLS +#endif /* __ACE_INLINE__ */ + ///////////////////////////////////////////////////////////////////////////// // // diff --git a/ace/config-sco-4.2-nothread.h b/ace/config-sco-4.2-nothread.h index 428f601493e..7b06f57db8e 100644 --- a/ace/config-sco-4.2-nothread.h +++ b/ace/config-sco-4.2-nothread.h @@ -12,6 +12,12 @@ #define SCO #endif /* SCO */ +#define __ACE_INLINE__ + +#if defined (__ACE_INLINE__) +#define ACE_HAS_INLINED_OSCALLS +#endif /* __ACE_INLINE__ */ + #if defined (SCO) && !defined (MAXPATHLEN) #define MAXPATHLEN 1023 #endif /* SCO */ diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h index d5d8f7aac77..edce9b257cd 100644 --- a/ace/config-sunos5.4-g++.h +++ b/ace/config-sunos5.4-g++.h @@ -9,6 +9,12 @@ #define ACE_HAS_UNICODE +#define __ACE_INLINE__ + +#if defined (__ACE_INLINE__) +#define ACE_HAS_INLINED_OSCALLS +#endif /* __ACE_INLINE__ */ + #define ACE_HAS_TERM_IOCTLS // Must specialize templates due to G++'s lame parameterized type diff --git a/ace/config-sunos5.5-g++.h b/ace/config-sunos5.5-g++.h index 25ef3de5c2c..e2965c8ef48 100644 --- a/ace/config-sunos5.5-g++.h +++ b/ace/config-sunos5.5-g++.h @@ -16,6 +16,8 @@ #define ACE_HAS_UNICODE +#define __ACE_INLINE__ + #if defined (__ACE_INLINE__) #define ACE_HAS_INLINED_OSCALLS #endif /* __ACE_INLINE__ */ diff --git a/ace/config-unixware-2.01-g++.h b/ace/config-unixware-2.01-g++.h index 9356b60145e..66ff69664ca 100644 --- a/ace/config-unixware-2.01-g++.h +++ b/ace/config-unixware-2.01-g++.h @@ -14,6 +14,8 @@ #define ACE_HAS_CPLUSPLUS_HEADERS #define ACE_HAS_GNU_CSTRING_H +#define __ACE_INLINE__ + #if defined (__ACE_INLINE__) #define ACE_HAS_INLINED_OSCALLS #endif /* __ACE_INLINE__ */ diff --git a/ace/config-vxworks-ghs-1.8.h b/ace/config-vxworks-ghs-1.8.h index 4c9fa3ab40a..bfec0d48c64 100644 --- a/ace/config-vxworks-ghs-1.8.h +++ b/ace/config-vxworks-ghs-1.8.h @@ -17,6 +17,8 @@ #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES #define ACE_HAS_CPLUSPLUS_HEADERS +#define __ACE_INLINE__ + #if defined (__ACE_INLINE__) #define ACE_HAS_INLINED_OSCALLS #endif /* __ACE_INLINE__ */ diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index 5c121529689..500aa89b0a3 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -2,7 +2,7 @@ # should allow ACE to be built on Linux. CC = gcc -w -CXX = g++ -w -I. -fno-strict-prototypes -D__ACE_INLINE__ +CXX = g++ -w -I. -fno-strict-prototypes # -D__ACE_INLINE__ DLD = $(CXX) LD = $(CXX) LIBS = -lstdc++ diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU index 134b765ce3d..40bb60cb3b7 100644 --- a/include/makeinclude/platform_linux_lxpthread.GNU +++ b/include/makeinclude/platform_linux_lxpthread.GNU @@ -7,7 +7,7 @@ # Jan Rychter <jwr@icm.edu.pl> CC = gcc -w -CXX = g++ -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 +CXX = g++ -w -I. -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 # -D__ACE_INLINE__ DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread -lstdc++ diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU index 134b765ce3d..40bb60cb3b7 100644 --- a/include/makeinclude/platform_linux_lxpthreads.GNU +++ b/include/makeinclude/platform_linux_lxpthreads.GNU @@ -7,7 +7,7 @@ # Jan Rychter <jwr@icm.edu.pl> CC = gcc -w -CXX = g++ -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 +CXX = g++ -w -I. -fno-strict-prototypes -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT -O2 # -D__ACE_INLINE__ DLD = $(CXX) LD = $(CXX) LIBS += -ldl -lpthread -lstdc++ diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU index 85369f80732..8910f7d92b6 100644 --- a/include/makeinclude/platform_linux_pthread.GNU +++ b/include/makeinclude/platform_linux_pthread.GNU @@ -8,7 +8,7 @@ # Jan Rychter <jwr@icm.edu.pl> CC = gcc -w -CXX = g++ -w -I. -fno-strict-prototypes -D__ACE_INLINE__ -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS +CXX = g++ -w -I. -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS # -D__ACE_INLINE__ DLD = $(CXX) LD = $(CXX) LIBS += -lpthreads -lstdc++ diff --git a/include/makeinclude/platform_osf1_4.0_g++.GNU b/include/makeinclude/platform_osf1_4.0_g++.GNU index 02c463c0e1c..044bf2e3a0b 100644 --- a/include/makeinclude/platform_osf1_4.0_g++.GNU +++ b/include/makeinclude/platform_osf1_4.0_g++.GNU @@ -2,7 +2,7 @@ # (OSF/1 4.0) and GCC in version 2.7.2.1 (or newer). CC = gcc -g -D_REENTRANT -CXX = g++ -g -D_REENTRANT -fno-strict-prototypes -D__ACE_INLINE__ +CXX = g++ -g -D_REENTRANT -fno-strict-prototypes # -D__ACE_INLINE__ LD = $(CXX) DLD = $(CXX) LIBS += -lpthread -lmach -lexc -ltli -lstdc++ diff --git a/include/makeinclude/platform_sco-nothread.GNU b/include/makeinclude/platform_sco-nothread.GNU index a38f80c6233..f0d14578558 100644 --- a/include/makeinclude/platform_sco-nothread.GNU +++ b/include/makeinclude/platform_sco-nothread.GNU @@ -4,7 +4,7 @@ CC = gcc -w # for threads # for no threads -CXX = g++ -fno-implicit-templates -w -I. -fno-strict-prototypes -D__ACE_INLINE__ +CXX = g++ -fno-implicit-templates -w -I. -fno-strict-prototypes # -D__ACE_INLINE__ DLD = $(CXX) LD = $(CXX) LIBS = -lstdc++ -lsocket diff --git a/include/makeinclude/platform_sunos4_g++.GNU b/include/makeinclude/platform_sunos4_g++.GNU index e31563c59a6..b4aa576cbae 100644 --- a/include/makeinclude/platform_sunos4_g++.GNU +++ b/include/makeinclude/platform_sunos4_g++.GNU @@ -3,7 +3,7 @@ # SOBUILD - compile into .so directly # CC = gcc -CXX = g++ -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo +CXX = g++ -I. -fno-strict-prototypes # -D__ACE_INLINE__ # -frepo DLD = /bin/ld LD = $(CXX) # diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU index 1c17c596d1a..2c57a224933 100644 --- a/include/makeinclude/platform_sunos5_g++.GNU +++ b/include/makeinclude/platform_sunos5_g++.GNU @@ -2,7 +2,7 @@ # # SOBUILD - compile into .so directly # -CXX = g++ -I. -Wall -Wpointer-arith -D__ACE_INLINE__ # -O2 -Winline +CXX = g++ -I. -Wall -Wpointer-arith # -D__ACE_INLINE__ # -O2 -Winline CC = $(CXX) DLD = $(CXX) LD = $(CXX) diff --git a/include/makeinclude/platform_sunos5_x86_g++.GNU b/include/makeinclude/platform_sunos5_x86_g++.GNU index 6e5e2f9265c..69019f241c0 100644 --- a/include/makeinclude/platform_sunos5_x86_g++.GNU +++ b/include/makeinclude/platform_sunos5_x86_g++.GNU @@ -3,7 +3,7 @@ # SOBUILD - compile into .so directly # CC = gcc -CXX = g++ -I. -fno-strict-prototypes -D__ACE_INLINE__ # -frepo +CXX = g++ -I. -fno-strict-prototypes # -D__ACE_INLINE__ # -frepo DLD = $(CXX) LD = $(CXX) LDFLAGS += -L $(WRAPPER_ROOT)/ace -L ./ # -z muldefs diff --git a/include/makeinclude/platform_unixware_g++.GNU b/include/makeinclude/platform_unixware_g++.GNU index fcfa1766f6d..d70b55cec6a 100644 --- a/include/makeinclude/platform_unixware_g++.GNU +++ b/include/makeinclude/platform_unixware_g++.GNU @@ -3,7 +3,7 @@ # SOBUILD - compile into .so directly # CC = gcc -w -CXX = g++ -I. -D__ACE_INLINE__ # -w -fno-strict-prototypes +CXX = g++ -I. # -D__ACE_INLINE__ # -w -fno-strict-prototypes DLD = $(CXX) LD = $(CXX) LDFLAGS += -L$(WRAPPER_ROOT)/ace -L./ -L/usr/lib diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU index 904a5e6a4fe..a31750380a8 100644 --- a/include/makeinclude/platform_vxworks5.x_g++.GNU +++ b/include/makeinclude/platform_vxworks5.x_g++.GNU @@ -10,7 +10,7 @@ GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126 CC = $(BIN_DIR)/g++ppc CXX = $(CC) -CCFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS -D__ACE_INLINE__ +CCFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604 -DVXWORKS # -D__ACE_INLINE__ INCLDIRS += -I$(TARGET_DIR)/h LD = $(BIN_DIR)/ldppc LDFLAGS += -r -L$(LIB_DIR) -L$(GCCLIB_DIR) diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU index 52144e92f47..bf664f05935 100644 --- a/include/makeinclude/platform_vxworks5.x_ghs.GNU +++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU @@ -2,7 +2,7 @@ # *not* using Orbix CC = cxvxppc CXX = $(CC) -CCFLAGS += --no_rtti -D__ACE_INLINE__ +CCFLAGS += --no_rtti # -D__ACE_INLINE__ DLD = $(CXX) LD = $(CXX) LIBS += /appl/newgreen/vxppc603/indlib.o |