You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ws...@locus.apache.org on 2000/04/01 07:02:07 UTC
cvs commit: apache-1.3/src/include ap_config.h hsregex.h
wsanchez 00/03/31 21:02:07
Modified: . configure
src Configure
src/helpers GuessOS
src/include ap_config.h hsregex.h
Log:
Uname string on Mac OS X will be Darwin.
Revision Changes Path
1.122 +1 -1 apache-1.3/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- configure 2000/03/02 20:32:47 1.121
+++ configure 2000/04/01 05:02:03 1.122
@@ -335,7 +335,7 @@
iflags_core="${iflags_core} -S \"-S\""
iflags_dso="${iflags_dso} -S \"-S\""
;;
- *-apple-macos*)
+ *-apple-darwin*)
default_layout="Mac OS X Server"
iflags_core="${iflags_core} -S \"-S\""
iflags_dso="${iflags_dso} -S \"-S\""
1.395 +5 -5 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.394
retrieving revision 1.395
diff -u -r1.394 -r1.395
--- Configure 2000/02/23 23:06:36 1.394
+++ Configure 2000/04/01 05:02:04 1.395
@@ -497,12 +497,12 @@
;;
*-apple-rhapsody*)
OS='Mac OS X Server'
- CFLAGS="$CFLAGS -DMAC_OS_X_SERVER"
+ CFLAGS="$CFLAGS -DDARWIN -DMAC_OS_X_SERVER"
DEF_WANTHSREGEX=yes
;;
- *-apple-macos*)
- OS='Mac OS'
- CFLAGS="$CFLAGS -DMAC_OS"
+ *-apple-darwin*)
+ OS='Darwin'
+ CFLAGS="$CFLAGS -DDARWIN"
DEF_WANTHSREGEX=yes
;;
*-dec-osf*)
@@ -1095,7 +1095,7 @@
LDFLAGS_SHLIB_EXPORT=''
SHLIB_SUFFIX_DEPTH=0
;;
- *-apple-rhapsody* | *-apple-macos* )
+ *-apple-rhapsody* | *-apple-darwin* )
LD_SHLIB="cc"
CFLAGS_SHLIB=""
LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress'
1.67 +2 -2 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- GuessOS 1999/12/17 13:52:00 1.66
+++ GuessOS 2000/04/01 05:02:05 1.67
@@ -273,9 +273,9 @@
echo "${MACHINE}-apple-rhapsody${RELEASE}"; exit 0
;;
- "Mac OS":*:*:*)
+ Darwin:*:*:*)
MACHINE=`uname -p`
- echo "${MACHINE}-apple-macos${RELEASE}"; exit 0
+ echo "${MACHINE}-apple-darwin${RELEASE}"; exit 0
;;
"RISC iX":*)
1.286 +4 -8 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- ap_config.h 2000/03/01 09:13:36 1.285
+++ ap_config.h 2000/04/01 05:02:06 1.286
@@ -409,13 +409,9 @@
#define DYLD_CANT_UNLOAD
#endif
-#elif defined(MAC_OS) || defined(MAC_OS_X_SERVER) /* Mac OS (>= 10.0) and Mac OS X Server (<= 5.x) */
+#elif defined(DARWIN) /* Darwin (Mac OS) */
#undef PLATFORM
-#ifdef MAC_OS_X_SERVER
-#define PLATFORM "Mac OS X Server"
-#else
-#define PLATFORM "Mac OS"
-#endif
+#define PLATFORM "Darwin"
#define HAVE_DYLD
#define HAVE_GMTOFF
#define HAVE_MMAP
@@ -1031,12 +1027,12 @@
#define CORE_EXPORT_NONSTD API_EXPORT_NONSTD
#endif
-/* On Mac OS X Server, symbols that conflict with loaded dylibs
+/* On Darwin, symbols that conflict with loaded dylibs
* (eg. System framework) need to be declared as private symbols with
* __private_extern__.
* For other systems, make that a no-op.
*/
-#if (defined(MAC_OS) || defined(MAC_OS_X_SERVER)) && defined(__DYNAMIC__)
+#if defined(DARWIN) && defined(__DYNAMIC__)
#define ap_private_extern __private_extern__
#else
#define ap_private_extern
1.14 +1 -1 apache-1.3/src/include/hsregex.h
Index: hsregex.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/hsregex.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- hsregex.h 1999/05/03 23:07:52 1.13
+++ hsregex.h 2000/04/01 05:02:06 1.14
@@ -16,7 +16,7 @@
#endif
#endif
-#if defined(MAC_OS) || defined(MAC_OS_X_SERVER)
+#if defined(DARWIN)
#define ap_private_extern __private_extern__
#else
#define ap_private_extern