ChangeLogTag: Thu May 26 07:35:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 40 insertions, 113 deletions

diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog
index fa1e1bb4aa5..db0eb62bdc0 100644
--- a/ACEXML/ChangeLog
+++ b/ACEXML/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 26 07:35:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * common/XML_Util.h:
+          Fixed pragma once warning
+
 Tue May 24 18:39:02 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* common/Makefile.am:
diff --git a/include/makeinclude/platform_cygwin32.GNU b/include/makeinclude/platform_cygwin32.GNU
index bcd4c51692f..ed9c9823ad0 100644
--- a/include/makeinclude/platform_cygwin32.GNU
+++ b/include/makeinclude/platform_cygwin32.GNU
@@ -11,9 +11,7 @@
 # Chose your target CPU (by default we set it to pentiumpro. In your
 # platform_macros.GNU file you can override this to pentium, i486 or i386
 #
-ifndef TCPU
-  TCPU = pentiumpro
-endif
+TCPU ?= pentiumpro
 
 cygwin32 = 1
 
diff --git a/include/makeinclude/platform_freebsd.GNU b/include/makeinclude/platform_freebsd.GNU
index ac207879e8b..01f91258877 100644
--- a/include/makeinclude/platform_freebsd.GNU
+++ b/include/makeinclude/platform_freebsd.GNU
@@ -14,22 +14,10 @@ ifeq ($(RET),1)
 versioned_so = 1
 endif
 
-ifndef exceptions
-  exceptions = 1
-endif
-
-ifeq (,$(threads))
-  threads = 1
-endif
-
-ifeq (,$(debug))
-  debug = 1
-endif
-
-ifeq (,$(optimize))
-  optimize = 1
-endif
-
+exceptions ?= 1
+threads ?= 1
+debug ?= 1
+optimize ?= 1
 pipes ?= 1
 
 CC              = gcc
@@ -71,10 +59,10 @@ endif # RET
 
 CFLAGS  += $(PTHREAD_CFLAGS)
 LIBS += $(PTHREAD_LIBS)
- 
+
 endif # threads
 
-# Test for template instantiation, add to SOFLAGS if SONAME set, 
+# Test for template instantiation, add to SOFLAGS if SONAME set,
 # add -E to LDFLAGS if using GNU ld
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU
index 9b3d2b57b14..e39d7b65ec8 100644
--- a/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/include/makeinclude/platform_gnuwin32_common.GNU
@@ -28,25 +28,13 @@ else
   endif
 endif
 
-ifndef winsock2
-  winsock2 = 1
-endif
+winsock2 ?= 1
+exceptions ?= 0
+debug ?= 1
+optimize ?= 1
+threads ?= 1
+pipes ?= 1
 
-ifndef exceptions
-  exceptions = 0
-endif
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(optimize))
-  optimize = 1
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
-ifeq (,$(pipes))
-  pipes = 1
-endif
 ifeq ($(debug),0)
 CFLAGS += -DNDEBUG
 endif
diff --git a/include/makeinclude/platform_osf1_3.2_cxx.GNU b/include/makeinclude/platform_osf1_3.2_cxx.GNU
index 8ba420eec32..7f3abb79f26 100644
--- a/include/makeinclude/platform_osf1_3.2_cxx.GNU
+++ b/include/makeinclude/platform_osf1_3.2_cxx.GNU
@@ -2,28 +2,16 @@
 
 # This platform macros file is intended to work with Digital UNIX 3.2
 # (OSF/1 3.2g) with CXX 5.7 or later.
-
-ifeq (,$(debug))
-  debug = 1
-endif
+debug ?= 1
 
 # exceptions=1 is the default on this platform. exceptions=0 has not
 # been tested. See the bottom of this file for more. Turning off exceptions
 # on this platform can cause bad things to happen.
-
-ifeq (,$(exceptions))
-  exceptions = 1
-endif
+exceptions ?= 1
 
 # We want to test with rtti=1
-
-ifeq (,$(rtti))
-   rtti = 1
-endif
-
-ifeq (,$(threads))
-  threads = 1
-endif
+rtti ?= 1
+threads ?= 1
 
 CC              = cxx
 CXX             = $(CC)
diff --git a/include/makeinclude/platform_osf1_4.x_cxx.GNU b/include/makeinclude/platform_osf1_4.x_cxx.GNU
index d6dbf82fb9a..47cdd96ae4b 100644
--- a/include/makeinclude/platform_osf1_4.x_cxx.GNU
+++ b/include/makeinclude/platform_osf1_4.x_cxx.GNU
@@ -5,35 +5,21 @@
 
 # Note that TAO has not been tested with debug=0 on this platform. So
 # you should be careful when turning off debug.
-
-ifeq (,$(debug))
-  debug = 1
-endif
+debug ?= 1
 
 # exceptions=1 is the default on this platform. exceptions=0 has not
 # been tested. See the bottom of this file for more. Turning off exceptions
 # on this platform can cause bad things to happen.
-
-ifeq (,$(exceptions))
-  exceptions = 1
-endif
+exceptions ?= 1
 
 # We want to test with rtti=1
-
-ifeq (,$(rtti))
-   rtti = 1
-endif
-
-ifeq (,$(threads))
-  threads = 1
-endif
+rtti ?= 1
+threads ?= 1
 
 # Use of Standard C++ Library requires some flags to be added to the
 # compile line
 #
-ifeq (,$(stdcpplib))
-  stdcpplib = 1
-endif
+stdcpplib ?= 1
 
 CC              = cxx
 CXX             = $(CC)
diff --git a/include/makeinclude/platform_osf1_4.x_g++.GNU b/include/makeinclude/platform_osf1_4.x_g++.GNU
index 5839fac3e19..d4af6cba618 100644
--- a/include/makeinclude/platform_osf1_4.x_g++.GNU
+++ b/include/makeinclude/platform_osf1_4.x_g++.GNU
@@ -2,25 +2,11 @@
 
 # This platform macros file is intended to work with Digital UNIX 4.x
 # (OSF/1 4.x) and GCC in version 2.7.2.1 (or newer).
-
-ifeq (,$(debug))
-  debug = 1
-endif
-
-ifeq (,$(exceptions))
-  exceptions = 1
-endif
-ifeq (,$(rtti))
-   rtti = 1
-endif
-
-ifeq (,$(threads))
-  threads = 1
-endif
-
-ifeq (,$(optimize))
-  optimize = 1
-endif
+debug ?= 1
+exceptions ?= 1
+rtti ?= 1
+threads ?= 1
+optimize ?= 1
 
 CC              = gcc
 CXX             = g++
diff --git a/include/makeinclude/platform_qnx_neutrino.GNU b/include/makeinclude/platform_qnx_neutrino.GNU
index 80c0eb57bbe..68bdb5ff4dc 100644
--- a/include/makeinclude/platform_qnx_neutrino.GNU
+++ b/include/makeinclude/platform_qnx_neutrino.GNU
@@ -5,18 +5,12 @@
 CROSS-COMPILE = 1
 static_libs_only = 1
 
-ifeq (,$(debug))
-  debug = 1
-endif # ! debug
-ifeq (,$(optimize))
-  optimize = 1
-endif # ! optimize
-ifeq (,$(repo))
-  repo = 1
-endif # ! repo
+debug ?= 1
+optimize ?= 1
+repo ?= 1
 
 pipes ?= 1
- 
+
 CC      = i386-nto-gcc
 CXX     = i386-nto-g++
 
@@ -35,7 +29,7 @@ SOFLAGS += -G $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB  = @true
 
-# Test for template instantiation, add to SOFLAGS if SONAME set, 
+# Test for template instantiation, add to SOFLAGS if SONAME set,
 # add -E to LDFLAGS if using GNU ld
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
diff --git a/include/makeinclude/platform_rtems.x_g++.GNU b/include/makeinclude/platform_rtems.x_g++.GNU
index 70ccdfbab0d..ea61a2a0a51 100644
--- a/include/makeinclude/platform_rtems.x_g++.GNU
+++ b/include/makeinclude/platform_rtems.x_g++.GNU
@@ -11,15 +11,9 @@
 
 CROSS-COMPILE = 1
 
-ifndef debug
-  debug = 1
-endif # ! debug
-ifndef optimize
-  optimize = 1
-endif # ! optimize
-ifndef rtti
-  rtti =
-endif # ! rtti
+debug ?= 1
+optimize ?= 1
+rtti ?= 1
 
 shared_libs =
 static_libs = 1