Commit 8a5d79fc authored by Brian Havard's avatar Brian Havard
Browse files

Get OS/2 working with new configure system. Yay! :) 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84522 13f79535-47bb-0310-9956-ffa450edef68
parent e9f41080

os/config.m4

+2 −0
Changes for os/config.m4: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess` 
case "$PLATFORM" in

*beos*)

  OS="beos";;

*pc-os2_emx*)

  OS="os2";;

*)

  OS="unix";;

esac

os/os2/Makefile.in

0 → 100644
+10 −0
Changes for os/os2/Makefile.in: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line 


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

os/os2/config.m4

0 → 100644
+4 −0
Changes for os/os2/config.m4: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
if test "$OS" = "os2" ; then

  CFLAGS="$CFLAGS -DOS2 -O2"

  LDFLAGS="$LDFLAGS -Zexe"

fi

os/os2/os.h

+3 −1
Changes for os/os2/os.h: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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 @@ INLINE int ap_os_is_path_absolute(const char *file); 
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 */

os/os2/util_os2.c

+5 −0
Changes for os/os2/util_os2.c: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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)