dgaudet 98/06/17 00:10:45
Modified: src CHANGES
src/include conf.h
Log:
fix compilation on linux arm
PR: 2443
Submitted by: Sam Kington <[EMAIL PROTECTED]>
Revision Changes Path
1.923 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- CHANGES 1998/06/16 09:42:30 1.922
+++ CHANGES 1998/06/17 07:10:38 1.923
@@ -1,5 +1,8 @@
Changes with Apache 1.3.1
+ *) PORT: Fix compilation problem on ARM Linux.
+ [Sam Kington <[EMAIL PROTECTED]>] PR#2443
+
*) Let APACI's configure script determine some configuration parameters
(Group, Port, ServerAdmin, ServerName) via some intelligent tests to
remove some of the classical hurdles for new users when setting up
1.216 +1 -1 apache-1.3/src/include/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- conf.h 1998/06/06 19:30:46 1.215
+++ conf.h 1998/06/17 07:10:42 1.216
@@ -1056,7 +1056,7 @@
* so we don't have to. Sigh...
*/
-#if defined(CRAY) || defined(__arm)
+#if defined(CRAY) || (defined(__arm) && !defined(LINUX))
#ifdef __STDC__
#define XtOffset(p_type,field) _Offsetof(p_type,field)
#else
