ChangeLogTag:Fri Jun 29 10:14:03 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

6 files changed, 50 insertions, 15 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 9d890a8a95f..60557ba8ce8 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -759,6 +759,24 @@ make: *** [libACE.so] Error 8
       for their target environment.  <p> If you have any fixes or
       suggestions for improving this port, please contact <a
       href="mailto:shuston@riverace.com">Steve Huston</a>.
+
+<li><strong>Mac OS X (10.0.x, not public beta)</strong><p>
+
+        The Mac OS X port of ACE is very much a work in progress.  Some
+        of the examples build and run, some of them don't yet.  Reactors
+        seem to work, while Proactors don't (Mac OS X doesn't use aio_*
+        calls for async i/o, it uses the OS X Event Queue instead, and 
+        the ACE port doesn't take this into account yet).  Also, on OS X,
+        you must set the DYLD_LIBRARY_PATH environment variable to
+        $ACE_ROOT/ace i.e. setenv DYLD_LIBRARY_PATH $ACE_ROOT/ace, or else
+        none of the examples will be able to find libACE.dylib.
+
+        John Zorko <j.zorko@att.net> began this port for a work
+        project, and basically only ported enough of ACE to be able to
+        do what we needed to with it on Mac OS X.  If you would like
+        to continue the port, please contact John since he as
+        interested in seeing ACE run, lean, mean and fully supported,
+        on Mac OS X. 
 </UL>
 
 
diff --git a/ChangeLog b/ChangeLog
index ef021404a56..267169d5efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jun 29 10:14:03 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-macosx.h: Removed some macros that don't apply to
+	  MacOSX.  Thanks to John Zorko <j.zorko@att.net> for contributing
+ 	  this.
+
+	* include/makeinclude/platform_macosx.GNU (CC): Changed
+	  the -fimplict-templates to -fno-implicit-templates.  Thanks to
+ 	  John Zorko <j.zorko@att.net> for contributing this.
+
 Wed Jun 27 12:00:34 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/FIFO_Send_Msg.i (send): Make sure that when we use the
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index ef021404a56..267169d5efc 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,13 @@
+Fri Jun 29 10:14:03 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-macosx.h: Removed some macros that don't apply to
+	  MacOSX.  Thanks to John Zorko <j.zorko@att.net> for contributing
+ 	  this.
+
+	* include/makeinclude/platform_macosx.GNU (CC): Changed
+	  the -fimplict-templates to -fno-implicit-templates.  Thanks to
+ 	  John Zorko <j.zorko@att.net> for contributing this.
+
 Wed Jun 27 12:00:34 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/FIFO_Send_Msg.i (send): Make sure that when we use the
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ef021404a56..267169d5efc 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,13 @@
+Fri Jun 29 10:14:03 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
+
+	* ace/config-macosx.h: Removed some macros that don't apply to
+	  MacOSX.  Thanks to John Zorko <j.zorko@att.net> for contributing
+ 	  this.
+
+	* include/makeinclude/platform_macosx.GNU (CC): Changed
+	  the -fimplict-templates to -fno-implicit-templates.  Thanks to
+ 	  John Zorko <j.zorko@att.net> for contributing this.
+
 Wed Jun 27 12:00:34 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
 	* ace/FIFO_Send_Msg.i (send): Make sure that when we use the
diff --git a/ace/config-macosx.h b/ace/config-macosx.h
index d45321f0789..9d9d9c938e8 100644
--- a/ace/config-macosx.h
+++ b/ace/config-macosx.h
@@ -5,7 +5,6 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
-
 #if ! defined (__ACE_INLINE__)
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
@@ -14,7 +13,7 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
-//#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
 
 #if defined (ACE_HAS_PENTIUM)
 # undef ACE_HAS_PENTIUM
@@ -31,13 +30,8 @@
 #define ACE_HAS_GPERF
 //#define ACE_HAS_POSIX_SEM
 
-
-
 #define ACE_HAS_SVR4_TLI
 
-
-
-#define ACE_HAS_CLOCK_GETTIME
 #define ACE_HAS_MEMCHR
 
 // Compiler/platform defines the sig_atomic_t typedef.
@@ -55,12 +49,10 @@
 //Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., SCO and FreeBSD)
 #define ACE_HAS_SIG_MACROS
 
-
 //#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_RWLOCK_T
 
-
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
@@ -97,7 +89,6 @@
 
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 
-
 // Compiler/platform supports alloca().
 #define ACE_HAS_ALLOCA
 
@@ -167,12 +158,9 @@
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_DIRENT
 
-
 #define ACE_LACKS_SETSCHED
-#define ACE_HAS_TANDEM_SIGNALS
 //#define ACE_HAS_RECURSIVE_MUTEXES
 
-
 #define ACE_HAS_TERM_IOCTLS
 #define ACE_USES_HIGH_BAUD_RATES
 #define TCGETS TIOCGETA
diff --git a/include/makeinclude/platform_macosx.GNU b/include/makeinclude/platform_macosx.GNU
index c1939e322d5..f75a1195c0d 100644
--- a/include/makeinclude/platform_macosx.GNU
+++ b/include/makeinclude/platform_macosx.GNU
@@ -2,11 +2,10 @@
 # platform_macosx.GNU
 # preliminary support for Mac OS X DP4, some stuff still doesn't work.
 
-
 CC              = cc
 CXX             = c++
 CFLAGS          += -Wall -Wpointer-arith -pipe
-CCFLAGS         += $(CFLAGS) -fno-implicit-templates -fcheck-new
+CCFLAGS         += $(CFLAGS) -fimplicit-templates -fcheck-new
 DCFLAGS         += -g
 DLD             = libtool
 LD              = $(CXX)