diff options
| author | bjh <bjh@13f79535-47bb-0310-9956-ffa450edef68> | 2000-03-27 03:18:20 +0000 |
|---|---|---|
| committer | bjh <bjh@13f79535-47bb-0310-9956-ffa450edef68> | 2000-03-27 03:18:20 +0000 |
| commit | 1e2bc1876687a72ecd0e6e54b51be6698f07262a (patch) | |
| tree | 4d53265f54e5ebba4fd0e882a6d9ef90a1adff29 /dso | |
| parent | a024d22d818b6f25cd3a9c22a43e5ae44d1bb41e (diff) | |
| download | libapr-1e2bc1876687a72ecd0e6e54b51be6698f07262a.tar.gz | |
Clean up OS/2 DSO code so it at least compiles.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59739 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dso')
| -rw-r--r-- | dso/os2/Makefile.in | 19 | ||||
| -rw-r--r-- | dso/os2/dso.c | 4 | ||||
| -rw-r--r-- | dso/os2/dso.h | 7 |
3 files changed, 15 insertions, 15 deletions
diff --git a/dso/os2/Makefile.in b/dso/os2/Makefile.in index d0dfd0438..8d928266b 100644 --- a/dso/os2/Makefile.in +++ b/dso/os2/Makefile.in @@ -3,6 +3,7 @@ #INCLUDES=$(INCLUDES1) $(INCLUDES0) $(EXTRA_INCLUDES) #LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS) +SHELL=@SH@ CC=@CC@ RANLIB=@RANLIB@ CFLAGS=@CFLAGS@ @OPTIM@ @@ -41,20 +42,16 @@ $(LIB): $(OBJS) depend: cp Makefile.in Makefile.in.bak \ && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \ - && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \ + && gcc -MM $(INCLUDES) $(CFLAGS) *.c | sed -e "s%\\\\\(.\)%/\\1%g" >> Makefile.new \ && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \ -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \ > Makefile.in \ && rm Makefile.new # DO NOT REMOVE -getopt.o: getopt.c misc.h ../../include/apr_config.h \ - ../../include/apr_general.h ../../include/apr.h \ - ../../include/apr_errno.h ../../include/apr_pools.h \ - ../../include/apr_lib.h ../../include/apr_file_io.h \ - ../../include/apr_getopt.h -start.o: start.c misc.h ../../include/apr_config.h \ - ../../include/apr_general.h ../../include/apr.h \ - ../../include/apr_errno.h ../../include/apr_pools.h \ - ../../include/apr_lib.h ../../include/apr_file_io.h \ - ../../include/apr_getopt.h +dso.o: dso.c dso.h $(INCDIR)/apr_config.h \ + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \ + $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \ + $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \ + $(INCDIR)/apr_time.h $(INCDIR)/apr_thread_proc.h \ + $(INCDIR)/apr_dso.h diff --git a/dso/os2/dso.c b/dso/os2/dso.c index 4ea96655b..ddcf83df6 100644 --- a/dso/os2/dso.c +++ b/dso/os2/dso.c @@ -54,7 +54,7 @@ * */ -#include "misc.h" +#include "dso.h" #define INCL_DOS #include <os2.h> #include <stdio.h> @@ -71,7 +71,7 @@ ap_status_t ap_dso_load(const char *path, ap_context_t *ctx, HMODULE handle; int rc; - if((rc = DosLoadModule(somebuf, sizeof(somebuf), path, &handle)) != 0) + if ((rc = DosLoadModule(somebuf, sizeof(somebuf), path, &handle)) != 0) return APR_EINIT; *res_handle = ap_pcalloc(ctx, sizeof(*res_handle)); diff --git a/dso/os2/dso.h b/dso/os2/dso.h index 1506ed209..44771f577 100644 --- a/dso/os2/dso.h +++ b/dso/os2/dso.h @@ -57,6 +57,9 @@ #ifndef DSO_H #define DSO_H +#define INCL_DOS +#include <os2.h> + #include "apr_config.h" #include "apr_general.h" #include "apr_pools.h" @@ -64,7 +67,7 @@ struct ap_dso_handle_st { HMODULE handle; /* Handle to the DSO loaded */ - ap_context_t cont; /* Context for returning error strings */ + ap_context_t *cont; /* Context for returning error strings */ }; -#endif
\ No newline at end of file +#endif |