curlx: move nonblock.[ch] into curlx/

Closes #17288

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index f7a25c5f845ab3a512ce0a02dfaedca8277fd250..2974e9c3d57d25984ae2f2fd3fcc2566abcac04a 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -26,6 +26,7 @@ LIB_CURLX_CFILES = \
   curlx/base64.c   \
   curlx/dynbuf.c   \
   curlx/multibyte.c \
+  curlx/nonblock.c \
   curlx/strparse.c \
   curlx/timediff.c \
   curlx/timeval.c  \
@@ -36,6 +37,7 @@ LIB_CURLX_HFILES = \
   curlx/curlx.h    \
   curlx/dynbuf.h   \
   curlx/multibyte.h \
+  curlx/nonblock.h \
   curlx/strparse.h \
   curlx/timediff.h \
   curlx/timeval.h  \
@@ -215,7 +217,6 @@ LIB_CFILES =         \
   multi.c            \
   multi_ev.c         \
   netrc.c            \
-  nonblock.c         \
   noproxy.c          \
   openldap.c         \
   parsedate.c        \
@@ -351,7 +352,6 @@ LIB_HFILES =         \
   multi_ev.h         \
   multiif.h          \
   netrc.h            \
-  nonblock.h         \
   noproxy.h          \
   parsedate.h        \
   pingpong.h         \

diff --git a/lib/cf-socket.h b/lib/cf-socket.h
index 1ce8404c07d010a07a544c2d71ce023920324772..d3e35098421ec833060336aac78444be33431a2f 100644 (file)
--- a/lib/cf-socket.h
+++ b/lib/cf-socket.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
+#include "curlx/nonblock.h" /* for curlx_nonblock() */
 #include "sockaddr.h"
 
 struct Curl_addrinfo;

diff --git a/lib/connect.h b/lib/connect.h
index 0e4886809a0dd89832fc8d1bba7e8b0c9406a7a2..81391aa430e6ad1a06e4bb952eebdfcf9145438a 100644 (file)
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -25,7 +25,7 @@
  ***************************************************************************/
 #include "curl_setup.h"
 
-#include "nonblock.h" /* for curlx_nonblock(), formerly Curl_nonblock() */
+#include "curlx/nonblock.h" /* for curlx_nonblock() */
 #include "sockaddr.h"
 #include "curlx/timeval.h"
 

diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index 562315bb0f5ed49316326af529442b0e5059ba35..62632c1e9cb3aa056335d7b5998ccee9c193ed2b 100644 (file)
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -30,7 +30,7 @@
 #include "curl_rtmp.h"
 #include "urldata.h"
 #include "url.h"
-#include "nonblock.h" /* for curlx_nonblock */
+#include "curlx/nonblock.h" /* for curlx_nonblock */
 #include "progress.h" /* for Curl_pgrsSetUploadSize */
 #include "transfer.h"
 #include "curlx/warnless.h"

diff --git a/lib/curlx/curlx.h b/lib/curlx/curlx.h
index b60ada345ea940dfa8312ab85fa2e5431b774ca5..c7b356aa9882e0a5dfa9796da153e1b83c4f9a96 100644 (file)
--- a/lib/curlx/curlx.h
+++ b/lib/curlx/curlx.h
@@ -31,7 +31,7 @@
  * be.
  */
 
-#include "../nonblock.h"
+#include "nonblock.h"
 /* "nonblock.h" provides curlx_nonblock() */
 
 #include "warnless.h"

diff --git a/lib/nonblock.c b/lib/curlx/nonblock.c
similarity index 98%
rename from lib/nonblock.c
rename to lib/curlx/nonblock.c
index a59cab83253e3a0caab926a4d743e29900e75745..409b187f1fda5f3318695339aeb6cac9607b0761 100644 (file)
--- a/lib/nonblock.c
+++ b/lib/curlx/nonblock.c
@@ -22,7 +22,7 @@
  *
  ***************************************************************************/
 
-#include "curl_setup.h"
+#include "../curl_setup.h"
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>

diff --git a/lib/nonblock.h b/lib/curlx/nonblock.h
similarity index 100%
rename from lib/nonblock.h
rename to lib/curlx/nonblock.h

diff --git a/lib/socketpair.c b/lib/socketpair.c
index ffe5143e9c14beb8634449466146fed1a50f995f..1d1d5a66f30b9d34c27a5745f40b7b5e7f8d178a 100644 (file)
--- a/lib/socketpair.c
+++ b/lib/socketpair.c
@@ -128,7 +128,7 @@ int Curl_socketpair(int domain, int type, int protocol,
 #endif /* !INADDR_LOOPBACK */
 #endif /* !_WIN32 */
 
-#include "nonblock.h" /* for curlx_nonblock */
+#include "curlx/nonblock.h" /* for curlx_nonblock */
 #include "curlx/timeval.h"  /* needed before select.h */
 #include "select.h"   /* for Curl_poll */
 

diff --git a/lib/ws.c b/lib/ws.c
index 966fd3172c8a833572b20305e70b6f0fc374ad93..93ec3a785ad9a67f7fc172c94e96a09ac534014f 100644 (file)
--- a/lib/ws.c
+++ b/lib/ws.c
@@ -39,7 +39,7 @@
 #include "easyif.h"
 #include "transfer.h"
 #include "select.h"
-#include "nonblock.h"
+#include "curlx/nonblock.h"
 #include "curlx/strparse.h"
 
 /* The last 3 #include files should be in this order */

diff --git a/projects/generate.bat b/projects/generate.bat
index 687eb3eed5db56c4dc2af7d8ba26bdcf37a42a1a..0f2bb2432b54961b669cfef303ccccf2b430cf28 100644 (file)
--- a/projects/generate.bat
+++ b/projects/generate.bat
@@ -153,12 +153,10 @@ rem
     ) else if "!var!" == "CURL_SRC_RC_FILES" (
       for /f "delims=" %%r in ('dir /b ..\src\*.rc') do call :element %1 src "%%r" %3
     ) else if "!var!" == "CURL_SRC_X_C_FILES" (
-      call :element %1 lib "nonblock.c" %3
       call :element %1 lib "version_win32.c" %3
     ) else if "!var!" == "CURL_SRC_X_H_FILES" (
       call :element %1 lib "config-win32.h" %3
       call :element %1 lib "curl_setup.h" %3
-      call :element %1 lib "nonblock.h" %3
       call :element %1 lib "version_win32.h" %3
     ) else if "!var!" == "CURL_LIB_C_FILES" (
       for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib "%%c" %3

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 23c9560d33ad4f5a31d6d9f9c7672a43d6c89545..a08968893bc9b981c44dd99e4cfd1ed49098ba05 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -35,7 +35,7 @@ CURLX_CFILES = \
   ../lib/curlx/base64.c \
   ../lib/curlx/multibyte.c \
   ../lib/curlx/dynbuf.c \
-  ../lib/nonblock.c \
+  ../lib/curlx/nonblock.c \
   ../lib/curlx/strparse.c \
   ../lib/curlx/timediff.c \
   ../lib/curlx/timeval.c \
@@ -46,7 +46,7 @@ CURLX_HFILES = \
   ../lib/curlx/multibyte.h \
   ../lib/curl_setup.h \
   ../lib/curlx/dynbuf.h \
-  ../lib/nonblock.h \
+  ../lib/curlx/nonblock.h \
   ../lib/curlx/strparse.h \
   ../lib/curlx/timediff.h \
   ../lib/curlx/timeval.h \

diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index d55f15438459ef1ddd8f7117c4141f6a74e855f1..0f49f06d9c0f687d2fc902bda8fca788479df54b 100644 (file)
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -30,7 +30,7 @@ MEMDEBUG = \
 
 CURLX_SRCS = \
   ../../lib/mprintf.c \
-  ../../lib/nonblock.c \
+  ../../lib/curlx/nonblock.c \
   ../../lib/curlx/strparse.c \
   ../../lib/strequal.c \
   ../../lib/curlx/warnless.c \
@@ -45,7 +45,7 @@ CURLX_SRCS = \
 CURLX_HDRS = \
   ../../lib/curlx/curlx.h \
   ../../lib/curl_ctype.h \
-  ../../lib/nonblock.h \
+  ../../lib/curlx/nonblock.h \
   ../../lib/strcase.h \
   ../../lib/curlx/warnless.h \
   ../../lib/curlx/timediff.h \

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 327cefd308a4e6a1861e91f779e3c127a8ff1308..33bc4dbec8a9b8269418252597a9c20f384f8a24 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -717,8 +717,8 @@ $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
 $(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c
        $(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c
 !ENDIF
-$(CURL_DIROBJ)\nonblock.obj: ../lib/nonblock.c
-       $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/nonblock.c
+$(CURL_DIROBJ)\nonblock.obj: ../lib/curlx/nonblock.c
+       $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/nonblock.c
 $(CURL_DIROBJ)\strparse.obj: ../lib/curlx/strparse.c
        $(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curlx/strparse.c
 $(CURL_DIROBJ)\strcase.obj: ../lib/strcase.c