From d9d75a5db54761256fee9df83244ff6b2fa5c59c Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sun, 19 Oct 2014 12:50:51 +0000 Subject: [PATCH] fixed multiple glitches for building on non-posix platforms --- qse/bld/msdos-watcom/makefile | 8 ++++---- qse/bld/os2-watcom/makefile | 16 ++++++++-------- qse/bld/qse.bkl | 2 +- qse/bld/readme.txt | 2 +- qse/bld/win32-borland/makefile | 16 ++++++++-------- qse/bld/win32-msvc/makefile | 16 ++++++++-------- qse/bld/win32-watcom/makefile | 16 ++++++++-------- qse/cmd/http/httpd.c | 6 ++++++ qse/include/qse/cmn/env.h | 4 ++-- qse/include/qse/cmn/str.h | 16 ++++++++-------- qse/lib/awk/fnc.h | 23 ++++++++++++----------- qse/lib/awk/mod-math.c | 4 +++- qse/lib/cmn/dir.c | 2 +- qse/lib/cmn/env.c | 4 ++-- qse/lib/cmn/nwad-skad.c | 4 +++- qse/lib/http/httpd-std-dns.h | 1 + qse/lib/http/httpd-std-mod.h | 22 ++++++++++++++++++---- qse/lib/http/httpd-std-urs.h | 4 ++-- qse/lib/http/httpd-std.c | 9 +++++++-- qse/lib/http/httpd.c | 7 +++++-- 20 files changed, 108 insertions(+), 74 deletions(-) diff --git a/qse/bld/msdos-watcom/makefile b/qse/bld/msdos-watcom/makefile index ef7c31b3..d5d752ed 100644 --- a/qse/bld/msdos-watcom/makefile +++ b/qse/bld/msdos-watcom/makefile @@ -247,6 +247,7 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_rbt.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_sll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_slmb.obj & @@ -338,7 +339,6 @@ LIBQSEHTTP_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_file.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_task.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_text.obj & @@ -638,6 +638,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_rbt.ob $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj : .AUTODEPEND ..\..\lib\cmn\rex.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj : .AUTODEPEND ..\..\lib\cmn\sck.c + $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj : .AUTODEPEND ..\..\lib\cmn\sio.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -869,9 +872,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj : .AUTODEPEND ..\..\lib\http\httpd-proxy.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj : .AUTODEPEND ..\..\lib\http\httpd-resol.c - $(CC) -bt=dos -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-static$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj : .AUTODEPEND ..\..\lib\http\httpd-std.c $(CC) -bt=dos -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< diff --git a/qse/bld/os2-watcom/makefile b/qse/bld/os2-watcom/makefile index 90241572..1efbff40 100644 --- a/qse/bld/os2-watcom/makefile +++ b/qse/bld/os2-watcom/makefile @@ -365,6 +365,7 @@ DLLQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rbt.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rex.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sck.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sio.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_slmb.obj & @@ -459,6 +460,7 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rbt.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_slmb.obj & @@ -591,7 +593,6 @@ DLLQSEHTTP_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_file.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_proxy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_resol.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_std.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_task.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_text.obj & @@ -608,7 +609,6 @@ LIBQSEHTTP_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_file.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_task.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_text.obj & @@ -1170,6 +1170,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rex.obj : .AUTODEPEND ..\..\lib\cmn\rex.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sck.obj : .AUTODEPEND ..\..\lib\cmn\sck.c + $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sio.obj : .AUTODEPEND ..\..\lib\cmn\sio.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< @@ -1443,6 +1446,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj : .AUTODEPEND ..\..\lib\cmn\rex.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj : .AUTODEPEND ..\..\lib\cmn\sck.c + $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj : .AUTODEPEND ..\..\lib\cmn\sio.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -1746,9 +1752,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_proxy.obj : .AUTODEPEND ..\..\lib\http\httpd-proxy.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSEHTTP_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_resol.obj : .AUTODEPEND ..\..\lib\http\httpd-resol.c - $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSEHTTP_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_std.obj : .AUTODEPEND ..\..\lib\http\httpd-std.c $(CC) -bt=os2 -zq -fo=$^@ $(DLLQSEHTTP_CFLAGS) $< @@ -1785,9 +1788,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj : .AUTODEPEND ..\..\lib\http\httpd-proxy.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj : .AUTODEPEND ..\..\lib\http\httpd-resol.c - $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj : .AUTODEPEND ..\..\lib\http\httpd-std.c $(CC) -bt=os2 -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< diff --git a/qse/bld/qse.bkl b/qse/bld/qse.bkl index 14335e74..cd121ec0 100644 --- a/qse/bld/qse.bkl +++ b/qse/bld/qse.bkl @@ -197,6 +197,7 @@ pma.c rbt.c rex.c + sck.c sio.c sll.c slmb.c @@ -282,7 +283,6 @@ httpd-dir.c httpd-file.c httpd-proxy.c - httpd-resol.c httpd-std.c httpd-task.c httpd-text.c diff --git a/qse/bld/readme.txt b/qse/bld/readme.txt index 2fff75b3..4446c0de 100644 --- a/qse/bld/readme.txt +++ b/qse/bld/readme.txt @@ -14,7 +14,7 @@ using the Watcom C/C++ compiler, you can do this. - cd os2-watcom - wmake BUILD=debug CHAR=wchar -To build a proteced-mode debug binary for the causeway Dos extender with the +To build a proteced-mode debug binary for the causeway DOS extender with the default wide-charcter type using the Watcom C/C++ compiler, you can do this. - cd msdos-watcom diff --git a/qse/bld/win32-borland/makefile b/qse/bld/win32-borland/makefile index 66f2d995..fcd18154 100644 --- a/qse/bld/win32-borland/makefile +++ b/qse/bld/win32-borland/makefile @@ -133,6 +133,7 @@ DLLQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pma.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rbt.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rex.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sck.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sio.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sll.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_slmb.obj \ @@ -228,6 +229,7 @@ LIBQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rbt.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sll.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_slmb.obj \ @@ -370,7 +372,6 @@ DLLQSEHTTP_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_file.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_proxy.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_resol.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_std.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_task.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_text.obj \ @@ -388,7 +389,6 @@ LIBQSEHTTP_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_file.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_task.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_text.obj \ @@ -1118,6 +1118,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rex.obj: ..\..\lib\cmn\rex.c $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\rex.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sck.obj: ..\..\lib\cmn\sck.c + $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\sck.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sio.obj: ..\..\lib\cmn\sio.c $(CC) -q -c -P- -o$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\sio.c @@ -1391,6 +1394,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj: ..\..\lib\cmn\rex.c $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\rex.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj: ..\..\lib\cmn\sck.c + $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\sck.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj: ..\..\lib\cmn\sio.c $(CC) -q -c -P- -o$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\sio.c @@ -1694,9 +1700,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_proxy.obj: ..\..\lib\http\httpd-proxy.c $(CC) -q -c -P- -o$@ $(DLLQSEHTTP_CFLAGS) ..\..\lib\http\httpd-proxy.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_resol.obj: ..\..\lib\http\httpd-resol.c - $(CC) -q -c -P- -o$@ $(DLLQSEHTTP_CFLAGS) ..\..\lib\http\httpd-resol.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_std.obj: ..\..\lib\http\httpd-std.c $(CC) -q -c -P- -o$@ $(DLLQSEHTTP_CFLAGS) ..\..\lib\http\httpd-std.c @@ -1733,9 +1736,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj: ..\..\lib\http\httpd-proxy.c $(CC) -q -c -P- -o$@ $(LIBQSEHTTP_CFLAGS) ..\..\lib\http\httpd-proxy.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj: ..\..\lib\http\httpd-resol.c - $(CC) -q -c -P- -o$@ $(LIBQSEHTTP_CFLAGS) ..\..\lib\http\httpd-resol.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj: ..\..\lib\http\httpd-std.c $(CC) -q -c -P- -o$@ $(LIBQSEHTTP_CFLAGS) ..\..\lib\http\httpd-std.c diff --git a/qse/bld/win32-msvc/makefile b/qse/bld/win32-msvc/makefile index 4e43eefc..58e9939b 100644 --- a/qse/bld/win32-msvc/makefile +++ b/qse/bld/win32-msvc/makefile @@ -102,6 +102,7 @@ DLLQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pma.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rbt.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rex.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sck.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sio.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sll.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_slmb.obj \ @@ -199,6 +200,7 @@ LIBQSECMN_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rbt.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj \ + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sll.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_slmb.obj \ @@ -361,7 +363,6 @@ DLLQSEHTTP_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_file.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_proxy.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_resol.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_std.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_task.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_text.obj \ @@ -381,7 +382,6 @@ LIBQSEHTTP_OBJECTS = \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_dir.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_file.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj \ - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_task.obj \ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_text.obj \ @@ -1197,6 +1197,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rex.obj: ..\..\lib\cmn\rex.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\rex.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sck.obj: ..\..\lib\cmn\sck.c + $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\sck.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sio.obj: ..\..\lib\cmn\sio.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSECMN_CFLAGS) ..\..\lib\cmn\sio.c @@ -1470,6 +1473,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj: ..\..\lib\cmn\rex.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\rex.c +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj: ..\..\lib\cmn\sck.c + $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\sck.c + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj: ..\..\lib\cmn\sio.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSECMN_CFLAGS) ..\..\lib\cmn\sio.c @@ -1773,9 +1779,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_proxy.obj: ..\..\lib\http\httpd-proxy.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSEHTTP_CFLAGS) ..\..\lib\http\httpd-proxy.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_resol.obj: ..\..\lib\http\httpd-resol.c - $(CC) /c /nologo /TC /Fo$@ $(DLLQSEHTTP_CFLAGS) ..\..\lib\http\httpd-resol.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_std.obj: ..\..\lib\http\httpd-std.c $(CC) /c /nologo /TC /Fo$@ $(DLLQSEHTTP_CFLAGS) ..\..\lib\http\httpd-std.c @@ -1812,9 +1815,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj: ..\..\lib\http\httpd-proxy.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSEHTTP_CFLAGS) ..\..\lib\http\httpd-proxy.c -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj: ..\..\lib\http\httpd-resol.c - $(CC) /c /nologo /TC /Fo$@ $(LIBQSEHTTP_CFLAGS) ..\..\lib\http\httpd-resol.c - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj: ..\..\lib\http\httpd-std.c $(CC) /c /nologo /TC /Fo$@ $(LIBQSEHTTP_CFLAGS) ..\..\lib\http\httpd-std.c diff --git a/qse/bld/win32-watcom/makefile b/qse/bld/win32-watcom/makefile index 3d69dc0a..ba47472b 100644 --- a/qse/bld/win32-watcom/makefile +++ b/qse/bld/win32-watcom/makefile @@ -354,6 +354,7 @@ DLLQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_pma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rbt.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rex.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sck.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sio.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_slmb.obj & @@ -448,6 +449,7 @@ LIBQSECMN_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_pma.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rbt.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj & + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sll.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_slmb.obj & @@ -580,7 +582,6 @@ DLLQSEHTTP_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_file.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_proxy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_resol.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_std.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_task.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_text.obj & @@ -597,7 +598,6 @@ LIBQSEHTTP_OBJECTS = & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_dir.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_file.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj & - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_task.obj & $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_text.obj & @@ -1159,6 +1159,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_rex.obj : .AUTODEPEND ..\..\lib\cmn\rex.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sck.obj : .AUTODEPEND ..\..\lib\cmn\sck.c + $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsecmn_sio.obj : .AUTODEPEND ..\..\lib\cmn\sio.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSECMN_CFLAGS) $< @@ -1432,6 +1435,9 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_rex.obj : .AUTODEPEND ..\..\lib\cmn\rex.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< +$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sck.obj : .AUTODEPEND ..\..\lib\cmn\sck.c + $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< + $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsecmn_sio.obj : .AUTODEPEND ..\..\lib\cmn\sio.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSECMN_CFLAGS) $< @@ -1735,9 +1741,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_proxy.obj : .AUTODEPEND ..\..\lib\http\httpd-proxy.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSEHTTP_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_resol.obj : .AUTODEPEND ..\..\lib\http\httpd-resol.c - $(CC) -bt=nt -zq -fo=$^@ $(DLLQSEHTTP_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\dllqsehttp_httpd_std.obj : .AUTODEPEND ..\..\lib\http\httpd-std.c $(CC) -bt=nt -zq -fo=$^@ $(DLLQSEHTTP_CFLAGS) $< @@ -1774,9 +1777,6 @@ $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libq $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_proxy.obj : .AUTODEPEND ..\..\lib\http\httpd-proxy.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< -$(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_resol.obj : .AUTODEPEND ..\..\lib\http\httpd-resol.c - $(CC) -bt=nt -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< - $(BUILDDIR_BUILD)-$(BUILDDIR_CHAR)-$(BUILDDIR_SHARED)$(BUILDDIR_TCPV40HDRS)\libqsehttp_httpd_std.obj : .AUTODEPEND ..\..\lib\http\httpd-std.c $(CC) -bt=nt -zq -fo=$^@ $(LIBQSEHTTP_CFLAGS) $< diff --git a/qse/cmd/http/httpd.c b/qse/cmd/http/httpd.c index 6868d616..48ebc09d 100644 --- a/qse/cmd/http/httpd.c +++ b/qse/cmd/http/httpd.c @@ -380,6 +380,7 @@ static int daemonize (int devnull) int xxxx (void* ctx, qse_env_char_t** envir) { /* NOTE: this is for experiment only */ +#if 0 extern char** environ; char buf[1000]; char* cl; @@ -401,6 +402,11 @@ printf ("%s", buf); /*} system ("while read xxx; do echo $xxx; done; echo 123 456 789");*/ printf ("\n"); +#endif + printf ("Content-Type: text/html\n\n"); + printf ("
\n");
+	system ("ls -laF /tmp");
+	printf ("
\n"); return 0; } diff --git a/qse/include/qse/cmn/env.h b/qse/include/qse/cmn/env.h index b9ab06d9..5004baf5 100644 --- a/qse/include/qse/cmn/env.h +++ b/qse/include/qse/cmn/env.h @@ -147,12 +147,12 @@ QSE_EXPORT int qse_env_insertmbsa ( * The qse_env_appendwcs() function appends an extra value to the last item * in the environment list. */ -int qse_env_appendwcs ( +QSE_EXPORT int qse_env_appendwcs ( qse_env_t* env, const qse_wchar_t* value ); -int qse_env_appendmbs ( +QSE_EXPORT int qse_env_appendmbs ( qse_env_t* env, const qse_mchar_t* value ); diff --git a/qse/include/qse/cmn/str.h b/qse/include/qse/cmn/str.h index faaff09a..4bc07d25 100644 --- a/qse/include/qse/cmn/str.h +++ b/qse/include/qse/cmn/str.h @@ -1582,13 +1582,13 @@ QSE_EXPORT qse_wchar_t* qse_wcsxnrcasestr ( # define qse_strxnrcasestr(str,strsz,sub,subsz) qse_wcsxnrcasestr(str,strsz,sub,subsz) #endif -const qse_mchar_t* qse_mbsword ( +QSE_EXPORT const qse_mchar_t* qse_mbsword ( const qse_mchar_t* str, const qse_mchar_t* word, qse_mchar_t extra_delim ); -const qse_wchar_t* qse_wcsword ( +QSE_EXPORT const qse_wchar_t* qse_wcsword ( const qse_wchar_t* str, const qse_wchar_t* word, qse_wchar_t extra_delim @@ -1600,7 +1600,7 @@ const qse_wchar_t* qse_wcsword ( * \a extra_delim. Pass QSE_MT('\0') if no extra delimiter is * needed. */ -const qse_mchar_t* qse_mbsxword ( +QSE_EXPORT const qse_mchar_t* qse_mbsxword ( const qse_mchar_t* str, qse_size_t len, const qse_mchar_t* word, @@ -1613,20 +1613,20 @@ const qse_mchar_t* qse_mbsxword ( * \a extra_delim. Pass QSE_WT('\0') if no extra delimiter is * needed. */ -const qse_wchar_t* qse_wcsxword ( +QSE_EXPORT const qse_wchar_t* qse_wcsxword ( const qse_wchar_t* str, qse_size_t len, const qse_wchar_t* word, qse_wchar_t extra_delim ); -const qse_mchar_t* qse_mbscaseword ( +QSE_EXPORT const qse_mchar_t* qse_mbscaseword ( const qse_mchar_t* str, const qse_mchar_t* word, qse_mchar_t extra_delim ); -const qse_wchar_t* qse_wcscaseword ( +QSE_EXPORT const qse_wchar_t* qse_wcscaseword ( const qse_wchar_t* str, const qse_wchar_t* word, qse_wchar_t extra_delim @@ -1636,7 +1636,7 @@ const qse_wchar_t* qse_wcscaseword ( * The qse_mbsxcaseword() function finds a whole word in a string * case-insensitively. */ -const qse_mchar_t* qse_mbsxcaseword ( +QSE_EXPORT const qse_mchar_t* qse_mbsxcaseword ( const qse_mchar_t* str, qse_size_t len, const qse_mchar_t* word, @@ -1647,7 +1647,7 @@ const qse_mchar_t* qse_mbsxcaseword ( * The qse_wcsxcaseword() function finds a whole word in a string * case-insensitively. */ -const qse_wchar_t* qse_wcsxcaseword ( +QSE_EXPORT const qse_wchar_t* qse_wcsxcaseword ( const qse_wchar_t* str, qse_size_t len, const qse_wchar_t* word, diff --git a/qse/lib/awk/fnc.h b/qse/lib/awk/fnc.h index 4e875e4c..4a18203f 100644 --- a/qse/lib/awk/fnc.h +++ b/qse/lib/awk/fnc.h @@ -44,17 +44,18 @@ extern "C" { qse_awk_fnc_t* qse_awk_findfnc (qse_awk_t* awk, const qse_cstr_t* name); -int qse_awk_fnc_index (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_rindex (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_length (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_substr (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_split (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_match (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_gsub (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_sub (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_tolower (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_toupper (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); -int qse_awk_fnc_sprintf (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +/* EXPORT is required for linking on windows as they are referenced by mod-str.c */ +QSE_EXPORT int qse_awk_fnc_index (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_rindex (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_length (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_substr (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_split (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_match (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_gsub (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_sub (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_tolower (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_toupper (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); +QSE_EXPORT int qse_awk_fnc_sprintf (qse_awk_rtx_t* rtx, const qse_awk_fnc_info_t* fi); #ifdef __cplusplus } diff --git a/qse/lib/awk/mod-math.c b/qse/lib/awk/mod-math.c index 0c3de629..fbf11c86 100644 --- a/qse/lib/awk/mod-math.c +++ b/qse/lib/awk/mod-math.c @@ -18,7 +18,7 @@ License along with QSE. If not, see . */ -#include "mod-str.h" +#include "mod-math.h" #include #include #include @@ -36,7 +36,9 @@ # if defined(_WIN32) || defined(__OS2__) || defined(__DOS__) # define HAVE_CEIL # define HAVE_FLOOR +# if !defined(__WATCOMC__) # define HAVE_ROUND +# endif # define HAVE_SINH # define HAVE_COSH # define HAVE_TANH diff --git a/qse/lib/cmn/dir.c b/qse/lib/cmn/dir.c index 76b2285b..e95f67c4 100644 --- a/qse/lib/cmn/dir.c +++ b/qse/lib/cmn/dir.c @@ -128,7 +128,7 @@ qse_dir_errnum_t qse_dir_geterrnum (qse_dir_t* dir) return dir->errnum; } -static int compare_dirent (qse_lda_t* lda, const void* dptr1, size_t dlen1, const void* dptr2, size_t dlen2) +static int compare_dirent (qse_lda_t* lda, const void* dptr1, qse_size_t dlen1, const void* dptr2, qse_size_t dlen2) { int n = QSE_MEMCMP (dptr1, dptr2, ((dlen1 < dlen2)? dlen1: dlen2)); if (n == 0 && dlen1 != dlen2) n = (dlen1 > dlen2)? 1: -1; diff --git a/qse/lib/cmn/env.c b/qse/lib/cmn/env.c index cb8ecd7c..83c3617e 100644 --- a/qse/lib/cmn/env.c +++ b/qse/lib/cmn/env.c @@ -415,7 +415,7 @@ static QSE_INLINE int append_wcs (qse_env_t* env, const qse_wchar_t* value[]) { #if defined(QSE_ENV_CHAR_IS_WCHAR) /* no conversion -> wchar */ - return appendw (env, name, value); + return appendw (env, value); #else /* convert wchar to mchar */ qse_mchar_t* valuedup[2]; @@ -469,7 +469,7 @@ static QSE_INLINE int append_mbs (qse_env_t* env, const qse_mchar_t* value[]) valuedup[0] = qse_mbsatowcsalldup (value, QSE_NULL, env->mmgr); if (valuedup[0] == QSE_NULL) return -1; valuedup[1] = QSE_NULL; - n = appendw (env, namedup, valuedup); + n = appendw (env, valuedup); QSE_MMGR_FREE (env->mmgr, valuedup[0]); return n; diff --git a/qse/lib/cmn/nwad-skad.c b/qse/lib/cmn/nwad-skad.c index d58572f6..1a189e44 100644 --- a/qse/lib/cmn/nwad-skad.c +++ b/qse/lib/cmn/nwad-skad.c @@ -25,7 +25,8 @@ # include # include /* sockaddr_in6 */ # include -# if (defined(__WATCOMC__) && (__WATCOMC__ < 1200)) +# undef AF_UNIX +# if defined(__WATCOMC__) && (__WATCOMC__ < 1200) /* the header files shipped with watcom 11 doesn't contain * proper inet6 support. note using the compiler version * in the contidional isn't that good idea since you @@ -41,6 +42,7 @@ /* though AF_INET6 is defined, there is no support * for it. so undefine it */ # undef AF_INET6 +# undef AF_UNIX # pragma library("tcpip32.lib") #elif defined(__DOS__) /* TODO: consider watt-32 */ diff --git a/qse/lib/http/httpd-std-dns.h b/qse/lib/http/httpd-std-dns.h index ac0357bc..c6e30025 100644 --- a/qse/lib/http/httpd-std-dns.h +++ b/qse/lib/http/httpd-std-dns.h @@ -299,6 +299,7 @@ static int dns_open (qse_httpd_t* httpd, qse_httpd_dns_t* dns) dns->handle[0] = QSE_INVALID_SCKHND; dns->handle[1] = QSE_INVALID_SCKHND; + dns->handle[2] = QSE_INVALID_SCKHND; dc = (dns_ctx_t*) qse_httpd_callocmem (httpd, QSE_SIZEOF(dns_ctx_t)); if (dc == NULL) goto oops; diff --git a/qse/lib/http/httpd-std-mod.h b/qse/lib/http/httpd-std-mod.h index 1e56da5a..01c8fbba 100644 --- a/qse/lib/http/httpd-std-mod.h +++ b/qse/lib/http/httpd-std-mod.h @@ -2,7 +2,12 @@ static void* mod_open (qse_httpd_t* httpd, const qse_char_t* sysname) { -#if defined(USE_LTDL) +#if defined(QSE_ENABLE_STATIC_MODULE) + + qse_httpd_seterrnum (httpd, QSE_HTTPD_ENOIMPL); + return QSE_NULL; + +#elif defined(USE_LTDL) void* h; qse_mchar_t* modpath; @@ -33,7 +38,7 @@ static void* mod_open (qse_httpd_t* httpd, const qse_char_t* sysname) HMODULE h; h = LoadLibrary (sysname); - if (!h) qse_httpd_seterrnum (httpd, syserr_to_errnum(GetLastError()); + if (!h) qse_httpd_seterrnum (httpd, syserr_to_errnum(GetLastError())); QSE_ASSERT (QSE_SIZEOF(h) <= QSE_SIZEOF(void*)); return h; @@ -113,7 +118,10 @@ static void* mod_open (qse_httpd_t* httpd, const qse_char_t* sysname) static void mod_close (qse_httpd_t* httpd, void* handle) { -#if defined(USE_LTDL) +#if defined(QSE_ENABLE_STATIC_MODULE) + /* this won't be called at all when modules are linked into + * the main library. */ +#elif defined(USE_LTDL) lt_dlclose (handle); #elif defined(_WIN32) FreeLibrary ((HMODULE)handle); @@ -142,7 +150,13 @@ static void* mod_symbol (qse_httpd_t* httpd, void* handle, const qse_char_t* nam } #endif -#if defined(USE_LTDL) + +#if defined(QSE_ENABLE_STATIC_MODULE) + /* this won't be called at all when modules are linked into + * the main library. */ + s = QSE_NULL; + +#elif defined(USE_LTDL) s = lt_dlsym (handle, mname); if (s == QSE_NULL) qse_httpd_seterrnum (httpd, syserr_to_errnum(errno)); #elif defined(_WIN32) diff --git a/qse/lib/http/httpd-std-urs.h b/qse/lib/http/httpd-std-urs.h index 4d55bcff..9b273f08 100644 --- a/qse/lib/http/httpd-std-urs.h +++ b/qse/lib/http/httpd-std-urs.h @@ -378,7 +378,7 @@ static void tmr_urs_tmout_handle (qse_tmr_t* tmr, const qse_ntime_t* now, void* tmout_event.handler = tmr_urs_tmout_handle; tmout_event.updater = tmr_urs_tmout_update; - if (sendto (req->urs_socket, req->pkt, req->pktlen, 0, (struct sockaddr*)&req->urs_skad, req->urs_skadlen) != req->pktlen) + if (sendto (req->urs_socket, (void*)req->pkt, req->pktlen, 0, (struct sockaddr*)&req->urs_skad, req->urs_skadlen) != req->pktlen) { /* error. fall thru */ qse_httpd_seterrnum (dc->httpd, SKERR_TO_ERRNUM()); @@ -537,7 +537,7 @@ static int urs_send (qse_httpd_t* httpd, qse_httpd_urs_t* urs, const qse_mchar_t } */ - if (sendto (req->urs_socket, req->pkt, req->pktlen, 0, (struct sockaddr*)&req->urs_skad, req->urs_skadlen) != req->pktlen) + if (sendto (req->urs_socket, (void*)req->pkt, req->pktlen, 0, (struct sockaddr*)&req->urs_skad, req->urs_skadlen) != req->pktlen) { qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); printf ("URS SENDTO FAILURE........................\n"); /* TODO: logging */ diff --git a/qse/lib/http/httpd-std.c b/qse/lib/http/httpd-std.c index 2cd2cd3c..7a3e817d 100644 --- a/qse/lib/http/httpd-std.c +++ b/qse/lib/http/httpd-std.c @@ -51,6 +51,8 @@ # define USE_LTDL # endif +# undef AF_UNIX + #elif defined(__OS2__) # include # include @@ -64,8 +66,11 @@ # endif # define INCL_DOSERRORS # define INCL_DOSFILEMGR +# define INCL_DOSMODULEMGR # include +# undef AF_UNIX + #elif defined(__DOS__) /* TODO */ # include @@ -168,7 +173,7 @@ static qse_httpd_errnum_t skerr_to_errnum (DWORD e) case WSAEINTR: return QSE_HTTPD_EINTR; - case WASEWOULDBLOCK: + case WSAEWOULDBLOCK: return QSE_HTTPD_EAGAIN; case WSAECONNREFUSED: @@ -826,7 +831,7 @@ static qse_sck_hnd_t open_client_socket (qse_httpd_t* httpd, int domain, int typ #endif */ - #if defined(AF_INET6) && defined(IPV6_V6ONLY) + #if defined(AF_INET6) && defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) if (domain == AF_INET6) { flag = 1; diff --git a/qse/lib/http/httpd.c b/qse/lib/http/httpd.c index 506eb988..4e685f40 100644 --- a/qse/lib/http/httpd.c +++ b/qse/lib/http/httpd.c @@ -783,7 +783,7 @@ static int activate_servers (qse_httpd_t* httpd) /* httpd->opt.rcb.log (httpd, 0, QSE_T("cannot activate %s"), buf); */ -#if 0 +#if 1 qse_printf(QSE_T("cannot activate [%s]\n"), buf); #endif continue; @@ -797,7 +797,7 @@ qse_printf(QSE_T("cannot activate [%s]\n"), buf); /* httpd->opt.rcb.log (httpd, 0, QSE_T("cannot activate %s - "), buf); */ -#if 0 +#if 1 qse_printf(QSE_T("cannot add handle [%s]\n"), buf); #endif @@ -1686,6 +1686,7 @@ int qse_httpd_loop (qse_httpd_t* httpd) } if (httpd->server.nactive <= 0) { +printf ("no active servers...\n"); if (httpd->dnsactive) deactivate_dns (httpd); if (httpd->ursactive) deactivate_urs (httpd); httpd->opt.scb.mux.close (httpd, httpd->mux); @@ -1694,6 +1695,7 @@ int qse_httpd_loop (qse_httpd_t* httpd) return -1; } +printf ("entering loop... ...\n"); xret = 0; while (!httpd->stopreq) @@ -1702,6 +1704,7 @@ int qse_httpd_loop (qse_httpd_t* httpd) count = httpd->opt.scb.mux.poll (httpd, httpd->mux, &tmout); if (count <= -1) { +printf ("mux errorr ... ...\n"); if (httpd->errnum != QSE_HTTPD_EINTR) { xret = -1;