romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-26 05:53:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

curlx: move nonblock.[ch] into curlx/

Browse source 
Closes #17288
This commit is contained in:
Daniel Stenberg 2025-05-08 10:52:57 +02:00
parent 27bc798369
commit 4190c73094
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
13 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Makefile.inc
View file

@ -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 \

2
lib/cf-socket.h
View file

@ -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;

2
lib/connect.h
View file

@ -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"

2
lib/curl_rtmp.c
View file

@ -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"

2
lib/curlx/curlx.h
View file

@ -31,7 +31,7 @@
* be.
*/
#include "../nonblock.h"
#include "nonblock.h"
/* "nonblock.h" provides curlx_nonblock() */
#include "warnless.h"

2
lib/nonblock.c → lib/curlx/nonblock.c
View file

@ -22,7 +22,7 @@
*
***************************************************************************/
#include "curl_setup.h"
#include "../curl_setup.h"
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>

0
lib/nonblock.h → lib/curlx/nonblock.h
View file

2
lib/socketpair.c
View file

@ -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 */

2
lib/ws.c
View file

@ -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 */

2
projects/generate.bat
View file

@ -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

4
src/Makefile.inc
View file

@ -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 \

4
tests/server/Makefile.inc
View file

@ -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 \

4
winbuild/MakefileBuild.vc
View file

@ -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