From ad073d3096540b8817d49ecb6d9982e93f36c457 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Mon, 29 Oct 2018 04:44:19 +0000 Subject: [PATCH] fixed some build files --- qse/lib/http/httpd-std-dns.h | 32 ++++++++++++++++---------------- qse/lib/si/Makefile.in | 2 +- qse/lib/xli/Makefile.in | 7 ++++++- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/qse/lib/http/httpd-std-dns.h b/qse/lib/http/httpd-std-dns.h index a55d90d9..314a5eae 100644 --- a/qse/lib/http/httpd-std-dns.h +++ b/qse/lib/http/httpd-std-dns.h @@ -376,7 +376,7 @@ static int dns_open (qse_httpd_t* httpd, qse_httpd_dns_t* dns) dns->handle[2] = open_client_socket (httpd, AF_UNIX, SOCK_DGRAM, 0); #endif - if (qse_isvalidsckhnd(dns->handle[2])) + if (qse_is_sck_valid(dns->handle[2])) { #if defined(AF_UNIX) qse_ntime_t now; @@ -395,15 +395,15 @@ static int dns_open (qse_httpd_t* httpd, qse_httpd_dns_t* dns) if (bind (dns->handle[2], (struct sockaddr*)&dc->unix_bind_addr, QSE_SIZEOF(dc->unix_bind_addr)) <= -1) { qse_httpd_seterrnum (httpd, SKERR_TO_ERRNUM()); - qse_closesckhnd (dns->handle[2]); + qse_close_sck (dns->handle[2]); dns->handle[2] = QSE_INVALID_SCKHND; } #endif } - if (!qse_isvalidsckhnd(dns->handle[0]) && - !qse_isvalidsckhnd(dns->handle[1]) && - !qse_isvalidsckhnd(dns->handle[2])) + if (!qse_is_sck_valid(dns->handle[0]) && + !qse_is_sck_valid(dns->handle[1]) && + !qse_is_sck_valid(dns->handle[2])) { /* don't set the error number here. * open_client_socket() should set it */ @@ -442,20 +442,20 @@ static int dns_open (qse_httpd_t* httpd, qse_httpd_dns_t* dns) } dns->handle_count = 3; - if (qse_isvalidsckhnd(dns->handle[0])) dns->handle_mask |= (1 << 0); - if (qse_isvalidsckhnd(dns->handle[1])) dns->handle_mask |= (1 << 1); - if (qse_isvalidsckhnd(dns->handle[2])) dns->handle_mask |= (1 << 2); + if (qse_is_sck_valid(dns->handle[0])) dns->handle_mask |= (1 << 0); + if (qse_is_sck_valid(dns->handle[1])) dns->handle_mask |= (1 << 1); + if (qse_is_sck_valid(dns->handle[2])) dns->handle_mask |= (1 << 2); dns->ctx = dc; return 0; oops: - if (qse_isvalidsckhnd(dns->handle[0])) qse_closesckhnd (dns->handle[0]); - if (qse_isvalidsckhnd(dns->handle[1])) qse_closesckhnd (dns->handle[1]); - if (qse_isvalidsckhnd(dns->handle[2])) + if (qse_is_sck_valid(dns->handle[0])) qse_close_sck (dns->handle[0]); + if (qse_is_sck_valid(dns->handle[1])) qse_close_sck (dns->handle[1]); + if (qse_is_sck_valid(dns->handle[2])) { - qse_closesckhnd (dns->handle[2]); + qse_close_sck (dns->handle[2]); #if defined(AF_UNIX) QSE_UNLINK (dc->unix_bind_addr.sun_path); #endif @@ -506,11 +506,11 @@ static void dns_close (qse_httpd_t* httpd, qse_httpd_dns_t* dns) } } - if (qse_isvalidsckhnd(dns->handle[0])) qse_closesckhnd (dns->handle[0]); - if (qse_isvalidsckhnd(dns->handle[1])) qse_closesckhnd (dns->handle[1]); - if (qse_isvalidsckhnd(dns->handle[2])) + if (qse_is_sck_valid(dns->handle[0])) qse_close_sck (dns->handle[0]); + if (qse_is_sck_valid(dns->handle[1])) qse_close_sck (dns->handle[1]); + if (qse_is_sck_valid(dns->handle[2])) { - qse_closesckhnd (dns->handle[2]); + qse_close_sck (dns->handle[2]); #if defined(AF_UNIX) QSE_UNLINK (dc->unix_bind_addr.sun_path); #endif diff --git a/qse/lib/si/Makefile.in b/qse/lib/si/Makefile.in index b205afe8..9b9c7c61 100644 --- a/qse/lib/si/Makefile.in +++ b/qse/lib/si/Makefile.in @@ -477,7 +477,7 @@ libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) $(SSL_LIBS) @ENABLE_CXX_TRUE@ Thread.cpp @ENABLE_CXX_TRUE@libqsesixx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined -@ENABLE_CXX_TRUE@libqsesixx_la_LIBADD = -lqsesi -lqsecmnxx -lqsecmn +@ENABLE_CXX_TRUE@libqsesixx_la_LIBADD = -lqsecmnxx -lqsesi -lqsecmn all: all-am .SUFFIXES: diff --git a/qse/lib/xli/Makefile.in b/qse/lib/xli/Makefile.in index eb44cecc..744d23ba 100644 --- a/qse/lib/xli/Makefile.in +++ b/qse/lib/xli/Makefile.in @@ -149,6 +149,10 @@ libqsexlixx_la_DEPENDENCIES = am__libqsexlixx_la_SOURCES_DIST = SkvEnv.cpp @ENABLE_CXX_TRUE@am_libqsexlixx_la_OBJECTS = SkvEnv.lo libqsexlixx_la_OBJECTS = $(am_libqsexlixx_la_OBJECTS) +libqsexlixx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ + $(AM_CXXFLAGS) $(CXXFLAGS) $(libqsexlixx_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @ENABLE_CXX_TRUE@am_libqsexlixx_la_rpath = -rpath $(libdir) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -410,6 +414,7 @@ libqsexli_la_SOURCES = xli-prv.h xli.c err.c \ libqsexli_la_LDFLAGS = -L../cmn -L../si -version-info 1:0:0 -no-undefined libqsexli_la_LIBADD = -lqsesi -lqsecmn @ENABLE_CXX_TRUE@libqsexlixx_la_SOURCES = SkvEnv.cpp +@ENABLE_CXX_TRUE@libqsexlixx_la_LDFLAGS = -L. -L../cmn -L../si -version-info 1:0:0 -no-undefined @ENABLE_CXX_TRUE@libqsexlixx_la_LIBADD = -lqsecmnxx -lqsexli -lqsesi -lqsecmn all: all-am @@ -484,7 +489,7 @@ libqsexli.la: $(libqsexli_la_OBJECTS) $(libqsexli_la_DEPENDENCIES) $(EXTRA_libqs $(AM_V_CCLD)$(libqsexli_la_LINK) -rpath $(libdir) $(libqsexli_la_OBJECTS) $(libqsexli_la_LIBADD) $(LIBS) libqsexlixx.la: $(libqsexlixx_la_OBJECTS) $(libqsexlixx_la_DEPENDENCIES) $(EXTRA_libqsexlixx_la_DEPENDENCIES) - $(AM_V_CXXLD)$(CXXLINK) $(am_libqsexlixx_la_rpath) $(libqsexlixx_la_OBJECTS) $(libqsexlixx_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libqsexlixx_la_LINK) $(am_libqsexlixx_la_rpath) $(libqsexlixx_la_OBJECTS) $(libqsexlixx_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT)