Mailing List Archive

randy 96/12/27 16:09:14

Modified: src CHANGES Configure conf.h http_main.c
Log:
Changes to allow compilation for Machten 4.0.3 on PowerPC.
Reviewed by: Alexei Kosut, Randy Terbush
Submitted by: Randal Schwartz

Revision Changes Path
1.104 +3 -0 apache/src/CHANGES

Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.103
retrieving revision 1.104
diff -C3 -r1.103 -r1.104
*** CHANGES 1996/12/28 00:04:48 1.103
--- CHANGES 1996/12/28 00:09:08 1.104
***************
*** 1,5 ****
--- 1,8 ----
Changes with Apache 1.2b4:

+ *) Add changes to allow compilation on Machten 4.0.3 for PowerPC.
+ [Randal Schwartz]
+
*) OS/2 changes to support an MMAP style scoreboard file and UNIX
style magic #! token for better script portability. [Garey Smiley]




1.63 +3 -0 apache/src/Configure

Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.62
retrieving revision 1.63
diff -C3 -r1.62 -r1.63
*** Configure 1996/12/27 14:30:29 1.62
--- Configure 1996/12/28 00:09:09 1.63
***************
*** 340,345 ****
--- 340,348 ----
CFLAGS="-DULTRIX"
DEF_WANTHSREGEX=yes
;;
+ *-powerpc-tenon-*)
+ LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
+ ;;
*) # default: Catch systems we don't know about
echo Sorry, but we cannot grok \"$PLAT\"
echo uname -m



1.63 +16 -0 apache/src/conf.h

Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -C3 -r1.62 -r1.63
*** conf.h 1996/12/28 00:04:49 1.62
--- conf.h 1996/12/28 00:09:09 1.63
***************
*** 402,407 ****
--- 402,423 ----
#define ARG_MAX _POSIX_ARG_MAX
#define HAVE_MMAP

+ #elif defined(__MACHTEN__)
+ typedef int rlim_t;
+ #define JMP_BUF sigjmp_buf
+ #undef NO_KILLPG
+ #define NO_SETSID
+ #define HAS_GMTOFF
+ #ifndef __MACHTEN_PPC__
+ #ifndef __MACHTEN_68K__
+ #define __MACHTEN_68K__
+ #endif
+ #define FLOCK_SERIALIZED_ACCEPT
+ #define NO_USE_SIGACTION
+ #undef NEED_STRDUP
+ #else
+ #define FCNTL_SERIALIZED_ACCEPT
+ #endif

/* Unknown system - Edit these to match */
#else



1.99 +4 -0 apache/src/http_main.c

Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -C3 -r1.98 -r1.99
*** http_main.c 1996/12/28 00:04:50 1.98
--- http_main.c 1996/12/28 00:09:10 1.99
***************
*** 195,201 ****
--- 195,205 ----
{
char lock_fname[30];

+ #ifdef __MACHTEN__
+ strcpy(lock_fname, "/var/tmp/htlock.XXXXXX");
+ #else
strcpy(lock_fname, "/usr/tmp/htlock.XXXXXX");
+ #endif

if (mktemp(lock_fname) == NULL || lock_fname[0] == '\0')
{