Date: 26 Jan 2000 07:51:46 -0000
Message-ID: <20000126075146.24837.qmail@hyperreal.org>
From: bjh@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/os/os2 Makefile.in config.m4 os.h
 util_os2.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

bjh         00/01/25 23:51:46

  Modified:    src/modules/mpm/spmt_os2 spmt_os2.c
               src/os   config.m4
               src/os/os2 os.h util_os2.c
  Added:       src/modules/mpm/spmt_os2 Makefile.in config.m4
               src/os/os2 Makefile.in config.m4
  Log:
  Get OS/2 working with new configure system. Yay! :)
  
  Revision  Changes    Path
  1.28      +2 -2      apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- spmt_os2.c	1999/12/01 00:45:02	1.27
  +++ spmt_os2.c	2000/01/26 07:51:41	1.28
  @@ -62,6 +62,7 @@
   #define INCL_DOSERRORS
   
   #include "httpd.h"
  +#include "ap_config.h"
   #include "mpm_default.h"
   #include "http_main.h"
   #include "http_log.h"
  @@ -76,6 +77,7 @@
   
   #include <os2.h>
   #include <stdlib.h>
  +#include <sys/signal.h>
   
   /* config globals */
   
  @@ -175,7 +177,6 @@
   }
   
   
  -#if defined(USE_OS2SEM_SERIALIZED_ACCEPT)
   
   static HMTX lock_sem = -1;
   
  @@ -242,7 +243,6 @@
       }
   }
   
  -#endif
   
   
   /* On some architectures it's safe to do unserialized accept()s in the single
  
  
  
  1.1                  apache-2.0/src/modules/mpm/spmt_os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  
  DEPTH     = ../../..
  topsrcdir = @topsrcdir@
  srcdir    = @srcdir@
  VPATH     = @srcdir@
  
  LTLIBRARY_NAME    = libspmt_os2.la
  LTLIBRARY_SOURCES = spmt_os2.c
  
  include $(topsrcdir)/build/ltlib.mk
  
  
  
  1.1                  apache-2.0/src/modules/mpm/spmt_os2/config.m4
  
  Index: config.m4
  ===================================================================
  if test "$MPM_NAME" = "spmt_os2" ; then
      AC_CACHE_SAVE
      APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
      CFLAGS="$CFLAGS -Zmt"
      LDFLAGS="$LDFLAGS -Zmt"
  fi
  
  
  
  1.4       +2 -0      apache-2.0/src/os/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/config.m4,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- config.m4	2000/01/11 17:28:28	1.3
  +++ config.m4	2000/01/26 07:51:43	1.4
  @@ -5,6 +5,8 @@
   case "$PLATFORM" in
   *beos*)
     OS="beos";;
  +*pc-os2_emx*)
  +  OS="os2";;
   *)
     OS="unix";;
   esac
  
  
  
  1.5       +3 -1      apache-2.0/src/os/os2/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/os2/os.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- os.h	2000/01/19 01:16:17	1.4
  +++ os.h	2000/01/26 07:51:45	1.5
  @@ -5,6 +5,8 @@
   #define HAVE_CANONICAL_FILENAME
   #define HAVE_DRIVE_LETTERS
   
  +#include <apr_general.h>
  +
   /*
    * This file in included in all Apache source code. It contains definitions
    * of facilities available on _this_ operating system (HAVE_* macros),
  @@ -29,7 +31,7 @@
   extern int ap_os_is_path_absolute(const char *file);
   #endif
   
  -API_EXPORT(char *) ap_os_canonical_filename(ap_context_t *p, const char *file);
  +char *ap_os_canonical_filename(ap_context_t *p, const char *file);
   #define ap_os_case_canonical_filename(p,f) ap_os_canonical_filename(p,f)
   #define ap_os_systemcase_filename(p,f) ap_os_canonical_filename(p,f)
   /* FIXME: the following should be implemented on this platform */
  
  
  
  1.6       +5 -0      apache-2.0/src/os/os2/util_os2.c
  
  Index: util_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/os2/util_os2.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- util_os2.c	1999/10/20 15:15:41	1.5
  +++ util_os2.c	2000/01/26 07:51:45	1.6
  @@ -3,6 +3,11 @@
   #include <os2.h>
   #include "httpd.h"
   #include "http_log.h"
  +#include "os.h"
  +#include <sys/time.h>
  +#include <sys/signal.h>
  +#include <ctype.h>
  +#include <string.h>
   
   
   API_EXPORT(char *)ap_os_canonical_filename(ap_context_t *pPool, const char *szFile)
  
  
  
  1.1                  apache-2.0/src/os/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  
  DEPTH     = ../..
  topsrcdir = @topsrcdir@
  srcdir    = @srcdir@
  VPATH     = @srcdir@
  
  LTLIBRARY_NAME    = libos.la
  LTLIBRARY_SOURCES = os.c os-inline.c util_os2.c iol_socket.c
  
  include $(topsrcdir)/build/ltlib.mk
  
  
  
  1.1                  apache-2.0/src/os/os2/config.m4
  
  Index: config.m4
  ===================================================================
  if test "$OS" = "os2" ; then
    CFLAGS="$CFLAGS -DOS2 -O2"
    LDFLAGS="$LDFLAGS -Zexe"
  fi