wsanchez 99/05/03 19:57:14
Modified: src CHANGES
src/include ap_config.h
src/os/unix os.h
Log:
Define PLATFORM for Mac OS in ap_config.h, not unix/os.c.
Seems cleaner and more flexible that way.
Revision Changes Path
1.1345 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1344
retrieving revision 1.1345
diff -u -r1.1344 -r1.1345
--- CHANGES 1999/05/04 01:07:29 1.1344
+++ CHANGES 1999/05/04 02:57:08 1.1345
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Add iconsdir, htdocsdir, and cgidir to config.layout.
+ [Wilfredo Sanchez]
+
*) Fix minor but annoying bug with the test for Configuration.tmpl
being newer than Configuration so that it is less likely to fail
when using APACI and shadow sources. [Wilfredo Sanchez]
1.257 +5 -0 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.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- ap_config.h 1999/05/03 23:07:52 1.256
+++ ap_config.h 1999/05/04 02:57:13 1.257
@@ -385,6 +385,11 @@
#define HAVE_SYSLOG 1
#elif defined(MAC_OS) || defined(MAC_OS_X_SERVER) /* Mac OS (>= 10.0) and
Mac OS X Server (<= 5.x) */
+#ifdef MAC_OS_X_SERVER
+#define PLATFORM "Mac OS X Server"
+#else
+#define PLATFORM "Mac OS"
+#endif
#define HAVE_DYLD
#ifdef MAC_OS_X_SERVER
#define DYLD_CANT_UNLOAD
1.41 +1 -3 apache-1.3/src/os/unix/os.h
Index: os.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- os.h 1999/05/03 23:03:45 1.40
+++ os.h 1999/05/04 02:57:14 1.41
@@ -60,9 +60,7 @@
#include "ap_config.h"
-#ifdef MAC_OS
-#define PLATFORM "Mac OS"
-#else
+#ifndef PLATFORM
#define PLATFORM "Unix"
#endif
