did more migrating works

qse/lib/http/Makefile.am

@@ -33,6 +33,6 @@ libqsehttp_la_SOURCES = \
 	upxd.c
 
 libqsehttp_la_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) $(CPPFLAGS_HTTPD_MOD) $(LTDLINCL)
-libqsehttp_la_LDFLAGS = -L../sys -L../cmn -L../io -version-info 1:0:0 -no-undefined 
-libqsehttp_la_LIBADD = -lqsesys -lqsecmn -lqseio $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS) $(LIBLTDL)
+libqsehttp_la_LDFLAGS = -L../si -L../cmn -version-info 1:0:0 -no-undefined 
+libqsehttp_la_LIBADD = -lqsesi -lqsecmn $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS) $(LIBLTDL)
 

qse/lib/http/Makefile.in

@@ -410,8 +410,8 @@ libqsehttp_la_SOURCES = \
 	upxd.c
 
 libqsehttp_la_CPPFLAGS = $(CPPFLAGS_ALL_COMMON) $(CPPFLAGS_HTTPD_MOD) $(LTDLINCL)
-libqsehttp_la_LDFLAGS = -L../sys -L../cmn -L../io -version-info 1:0:0 -no-undefined 
-libqsehttp_la_LIBADD = -lqsesys -lqsecmn -lqseio $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS) $(LIBLTDL)
+libqsehttp_la_LDFLAGS = -L../si -L../cmn -version-info 1:0:0 -no-undefined 
+libqsehttp_la_LIBADD = -lqsesi -lqsecmn $(SOCKET_LIBS) $(SENDFILE_LIBS) $(SSL_LIBS) $(LIBLTDL)
 all: all-am
 
 .SUFFIXES:

qse/lib/http/htrd.c

@@ -27,7 +27,7 @@
 #include <qse/http/htrd.h>
 #include <qse/cmn/chr.h>
 #include <qse/cmn/path.h>
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 
 static const qse_mchar_t NUL = QSE_MT('\0');
 

qse/lib/http/htre.c

@@ -25,7 +25,7 @@
  */
 
 #include <qse/http/htre.h>
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 
 static void free_hdrval (qse_htb_t* htb, void* vptr, qse_size_t vlen)
 {

qse/lib/http/http.c

@@ -28,7 +28,7 @@
 #include <qse/cmn/str.h>
 #include <qse/cmn/chr.h>
 #include <qse/cmn/htb.h>
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 
 int qse_comparehttpversions (
 	const qse_http_version_t* v1,

qse/lib/http/httpd-cgi.c

@@ -25,7 +25,7 @@
  */
 
 #include "httpd.h"
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 #include <qse/cmn/str.h>
 #include <qse/si/pio.h>
 #include <qse/cmn/fmt.h>

qse/lib/http/httpd-dir.c

@@ -25,7 +25,7 @@
  */
 
 #include "httpd.h"
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 #include <qse/cmn/str.h>
 #include <qse/cmn/fmt.h>
 

qse/lib/http/httpd-file.c

@@ -25,7 +25,7 @@
  */
 
 #include "httpd.h"
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 #include <qse/cmn/str.h>
 #include <qse/cmn/fmt.h>
 

qse/lib/http/httpd-proxy.c

@@ -26,7 +26,7 @@
 
 
 #include "httpd.h"
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 #include <qse/cmn/str.h>
 #include <qse/cmn/fmt.h>
 #include <qse/cmn/hton.h>

qse/lib/http/httpd-std.c

@@ -26,7 +26,7 @@
 
 #include <qse/http/stdhttpd.h>
 #include "httpd.h"
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 #include <qse/cmn/hton.h>
 #include <qse/cmn/mbwc.h>
 #include <qse/cmn/str.h>
@@ -34,7 +34,7 @@
 #include <qse/cmn/alg.h>
 #include <qse/cmn/fmt.h>
 #include <qse/cmn/path.h>
-#include <qse/cmn/dir.h>
+#include <qse/si/dir.h>
 #include <qse/si/fio.h>
 #include <qse/si/sio.h>
 #include <qse/si/mux.h>

qse/lib/http/httpd-task.c

@@ -26,7 +26,7 @@
 
 #include "httpd.h"
 #include <qse/cmn/str.h>
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 
 /* TODO:
  * many functions in this file use qse_size_t.

qse/lib/http/httpd-text.c

@@ -25,7 +25,7 @@
  */
 
 #include "httpd.h"
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 #include <qse/cmn/fmt.h>
 
 typedef struct task_text_t task_text_t;

qse/lib/http/httpd.c

@@ -25,7 +25,7 @@
  */
 
 #include "httpd.h"
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 #include <qse/cmn/chr.h>
 #include <qse/cmn/str.h>
 #include <qse/cmn/mbwc.h>

qse/lib/http/upxd.h

@@ -28,7 +28,7 @@
 #define _QSE_LIB_NET_UPXD_H_
 
 #include <qse/http/upxd.h>
-#include "../cmn/mem.h"
+#include "../cmn/mem-prv.h"
 
 typedef struct qse_upxd_server_session_t qse_upxd_server_session_t;