]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
resolve: fix building without Unix sockets and `CURLDEBUG`
authorViktor Szakats <commit@vsz.me>
Thu, 13 Mar 2025 02:15:46 +0000 (03:15 +0100)
committerViktor Szakats <commit@vsz.me>
Thu, 13 Mar 2025 10:36:54 +0000 (11:36 +0100)
```
In file included from server_bundle.c:7:
../../../tests/server/resolve.c:110:5: error: unknown type name 'curl_socket_t'; did you mean 'curl_socklen_t'?
    curl_socket_t s = socket(PF_INET6, SOCK_DGRAM, 0);
    ^~~~~~~~~~~~~
    curl_socklen_t
../../../include/curl/system.h:392:38: note: 'curl_socklen_t' declared here
  typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
                                     ^
In file included from server_bundle.c:7:
../../../tests/server/resolve.c:111:13: error: use of undeclared identifier 'CURL_SOCKET_BAD'
    if(s == CURL_SOCKET_BAD)
            ^
```
Ref: https://github.com/curl/curl/actions/runs/13825438937/job/38679418428?pr=15000#step:14:47

Cherry-picked from #15000
Closes #16700

tests/server/util.h

index 09008f1042a322c6bf6a0ea919d42eb6a3ddfddd..9be412216acb67e3564f24321647b085ad540c23 100644 (file)
@@ -92,8 +92,9 @@ extern HANDLE exit_event;
 void install_signal_handlers(bool keep_sigalrm);
 void restore_signal_handlers(bool keep_sigalrm);
 
-#ifdef USE_UNIX_SOCKETS
 #include <curl/curl.h> /* for curl_socket_t */
+
+#ifdef USE_UNIX_SOCKETS
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h> /* for sockaddr_un */
 #endif