Merge pull request #1004 from jamesjer/master

Prepare for stricter checking in GCC 14
ocsigen · May 3, 2024 · 2d27668 · 2d27668
2 parents 8292e3d + 0d8725d
commit 2d27668
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/unix/config/discover.ml b/src/unix/config/discover.ml
@@ -652,56 +652,55 @@ struct
 
         int main()
         {
-            struct hostent *he;
-            struct servent *se;
-            he =
+            int x;
+            x =
               gethostbyname_r(
                 (const char*)NULL,
                 (struct hostent*)NULL,
                 (char*)NULL,
                 (int)0,
                 (struct hostent**)NULL,
                 (int*)NULL);
-            he =
+            x =
               gethostbyaddr_r(
-                (const char*)NULL,
+                (const void*)NULL,
                 (int)0,
                 (int)0,
                 (struct hostent*)NULL,
                 (char*)NULL,
                 (int)0,
                 (struct hostent**)NULL,
                 (int*)NULL);
-            se =
+            x =
               getservbyname_r(
                 (const char*)NULL,
                 (const char*)NULL,
                 (struct servent*)NULL,
                 (char*)NULL,
                 (int)0,
                 (struct servent**)NULL);
-            se =
+            x =
               getservbyport_r(
                 (int)0,
                 (const char*)NULL,
                 (struct servent*)NULL,
                 (char*)NULL,
                 (int)0,
                 (struct servent**)NULL);
-            pr =
+            x =
               getprotoent_r(
                 (struct protoent*)NULL,
                 (char*)NULL,
                 (int)0,
                 (struct protoent**)NULL);
-            pr =
+            x =
               getprotobyname_r(
                 (const char*)NULL,
                 (struct protoent*)NULL,
                 (char*)NULL,
                 (int)0,
                 (struct protoent**)NULL);
-            pr =
+            x =
               getprotobynumber_r(
                 (int)0,
                 (struct protoent*)NULL,
@@ -793,7 +792,7 @@ struct
 
         int main()
         {
-            int (*mincore_ptr)(const void*, size_t, char*) = mincore;
+            int (*mincore_ptr)(void*, size_t, unsigned char*) = mincore;
             return (int)(mincore_ptr == NULL);
         }
       |}

diff --git a/src/unix/unix_c/unix_getprotoby_getservby_job.c b/src/unix/unix_c/unix_getprotoby_getservby_job.c
@@ -9,6 +9,7 @@
 
 #define ARGS(args...) args
 
+#include <errno.h>
 #include <caml/alloc.h>
 #include <caml/fail.h>
 #include <caml/memory.h>