diff options
| author | Brian Havard <bjh@apache.org> | 2000-01-26 07:51:45 +0000 |
|---|---|---|
| committer | Brian Havard <bjh@apache.org> | 2000-01-26 07:51:45 +0000 |
| commit | 90ea71ab2e77804e0e314a5348cf51664d8d3f61 (patch) | |
| tree | 31a6d2b8da49d1b0220245b75f2efd5cd4816a95 /os | |
| parent | a65a6b4bcc07cddacc0f883b7ebbd550d75d6f34 (diff) | |
| download | httpd-90ea71ab2e77804e0e314a5348cf51664d8d3f61.tar.gz | |
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
Diffstat (limited to 'os')
| -rw-r--r-- | os/config.m4 | 2 | ||||
| -rw-r--r-- | os/os2/Makefile.in | 10 | ||||
| -rw-r--r-- | os/os2/config.m4 | 4 | ||||
| -rw-r--r-- | os/os2/os.h | 4 | ||||
| -rw-r--r-- | os/os2/util_os2.c | 5 |
5 files changed, 24 insertions, 1 deletions
diff --git a/os/config.m4 b/os/config.m4 index 4bd86a3dd6..0c2486c7b4 100644 --- a/os/config.m4 +++ b/os/config.m4 @@ -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 diff --git a/os/os2/Makefile.in b/os/os2/Makefile.in new file mode 100644 index 0000000000..c03ac3fca1 --- /dev/null +++ b/os/os2/Makefile.in @@ -0,0 +1,10 @@ + +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 diff --git a/os/os2/config.m4 b/os/os2/config.m4 new file mode 100644 index 0000000000..d6bab02dd4 --- /dev/null +++ b/os/os2/config.m4 @@ -0,0 +1,4 @@ +if test "$OS" = "os2" ; then + CFLAGS="$CFLAGS -DOS2 -O2" + LDFLAGS="$LDFLAGS -Zexe" +fi diff --git a/os/os2/os.h b/os/os2/os.h index 22355ab4cf..20ebcec9f4 100644 --- a/os/os2/os.h +++ b/os/os2/os.h @@ -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 */ diff --git a/os/os2/util_os2.c b/os/os2/util_os2.c index a49d392975..536c40946d 100644 --- a/os/os2/util_os2.c +++ b/os/os2/util_os2.c @@ -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) |