marc 98/10/18 19:16:30
Modified: src CHANGES
src/include ap_config.h hsregex.h
src/regex regex2.h
Log:
Remove ap_private_extern method of hiding conflicting symbols
on the NEXT platform because it is not correct for all versions,
and the versions for which it is correct are unknown.
Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]>
Revision Changes Path
1.1111 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1110
retrieving revision 1.1111
diff -u -r1.1110 -r1.1111
--- CHANGES 1998/10/17 14:17:08 1.1110
+++ CHANGES 1998/10/19 02:16:25 1.1111
@@ -1,5 +1,10 @@
Changes with Apache 1.3.4
+ *) Remove ap_private_extern method of hiding conflicting symbols
+ on the NEXT platform because it is not correct for all versions,
+ and the versions for which it is correct are unknown.
+ [Wilfredo Sanchez <[EMAIL PROTECTED]>]
+
*) Fix inheritance of IndexOptions NameWidth and remove unintended
restriction on +NameWidth, +IconHeight, and +IconWidth. [Ken Coar]
1.241 +2 -2 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- ap_config.h 1998/10/07 21:48:58 1.240
+++ ap_config.h 1998/10/19 02:16:27 1.241
@@ -849,12 +849,12 @@
#define CORE_EXPORT_NONSTD API_EXPORT_NONSTD
#endif
-/* On OpenStep and Rhapsody, symbols that conflict with loaded dylibs
+/* On Mac OS X Server, 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(RHAPSODY) || defined(NEXT)
+#if defined(RHAPSODY)
#define ap_private_extern __private_extern__
#else
#define ap_private_extern
1.12 +1 -1 apache-1.3/src/include/hsregex.h
Index: hsregex.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/hsregex.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- hsregex.h 1998/09/15 19:47:40 1.11
+++ hsregex.h 1998/10/19 02:16:27 1.12
@@ -16,7 +16,7 @@
#endif
#endif
-#if defined(RHAPSODY) || defined(NEXT)
+#if defined(RHAPSODY)
#define ap_private_extern __private_extern__
#else
#define ap_private_extern
1.8 +1 -1 apache-1.3/src/regex/regex2.h
Index: regex2.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/regex/regex2.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- regex2.h 1998/09/15 19:47:45 1.7
+++ regex2.h 1998/10/19 02:16:28 1.8
@@ -8,7 +8,7 @@
= #endif
= #endif
=
- = #if defined(RHAPSODY) || defined(NEXT)
+ = #if defined(RHAPSODY)
= #define ap_private_extern __private_extern__
= #else
= #define ap_private_extern
