CI: Add DJGPP

.github/workflows/djgpp.yml

@@ -0,0 +1,63 @@
+# Copyright (C) The c-ares project and its contributors
+# SPDX-License-Identifier: MIT
+name: DJGPP
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - name: Install GNU Make
+        run: |
+          choco install --yes make
+      - name: Checkout c-ares
+        uses: actions/checkout@v4
+      - name: Checkout Watt-32
+        uses: actions/checkout@v4
+        with:
+          repository: gvanem/Watt-32
+          path: watt-32
+      - name: Fetch DJGPP
+        run: |
+          Invoke-WebRequest https://github.com/andrewwutw/build-djgpp/releases/download/v3.4/djgpp-mingw-gcc1220-standalone.zip -OutFile djgpp-mingw-gcc1220-standalone.zip
+          Expand-Archive -Path djgpp-mingw-gcc1220-standalone.zip -DestinationPath .
+      - name: Set DJGPP_PATH environment variable
+        run: |
+          $PWD=Get-Location
+          $DJGPP_PATH="$PWD/djgpp".Replace('\', '/')
+          Add-Content -Path $Env:GITHUB_ENV -Value "DJGPP_PATH=$DJGPP_PATH"
+      - name: Set WATT_ROOT Environment variable
+        run: |
+          $PWD=Get-Location
+          $WATT_ROOT="$PWD/watt-32".Replace('\', '/')
+          Add-Content -Path $Env:GITHUB_ENV -Value "WATT_ROOT=$WATT_ROOT"
+      - name: Build Watt-32
+        run: |
+          cd watt-32\src
+          & .\configur.bat djgpp
+          echo "Configured"
+          make -f djgpp.mak
+        env:
+          DJGPP_PREFIX: "${{ env.DJGPP_PATH }}/bin/i586-pc-msdosdjgpp"
+          # Powershell doesn't preserve environment variables set by configur.bat
+          MKMAKE: ..\util\win32\mkmake.exe
+          MKDEP: ..\util\win32\mkdep.exe
+          HC_ERR: ..\util\win32\hc_err.exe
+          WC_ERR: ..\util\win32\wc_err.exe
+          BCC_ERR: ..\util\win32\bcc_err.exe
+          W32_BIN2C: ..\util\win32\bin2c.exe
+          W32_BIN2C_: ../util/win32/bin2c.exe
+          W32_NASM: ..\util\win32\nasm.exe
+          W32_NASM_: ../util/win32/nasm.exe
+          DJ_ERR: ..\util\win32\dj_err.exe
+      - name: Build c-ares
+        run: |
+          Copy-Item "include\ares_build.h.dist" -Destination "include\ares_build.h"
+          make -f Makefile.dj
+        env:
+          DJ_PREFIX: "${{ env.DJGPP_PATH }}/bin/i586-pc-msdosdjgpp-"
+
+
+

Makefile.dj

@@ -20,10 +20,47 @@ WATT32_LIB  = $(WATT32_ROOT)/lib/libwatt.a
 OBJ_DIR = djgpp
 
 CFLAGS = -g -O2 -I./include -I./src/lib \
-         -I$(WATT32_ROOT)/inc -Wall \
+         -I$(WATT32_ROOT)/inc \
+         -Wall \
+         -Wextra \
+         -Wcast-align \
+         -Wconversion \
+         -Wdeclaration-after-statement \
+         -Wdouble-promotion \
+         -Wfloat-equal \
+         -Winit-self \
+         -Wjump-misses-init \
+         -Wlogical-op \
+         -Wmissing-braces \
+         -Wmissing-declarations \
+         -Wmissing-format-attribute \
+         -Wmissing-include-dirs \
+         -Wmissing-prototypes \
+         -Wnested-externs \
+         -Wno-coverage-mismatch \
+         -Wold-style-definition \
+         -Wpacked \
+         -Wpointer-arith \
+         -Wshadow \
+         -Wsign-conversion \
+         -Wstrict-overflow \
+         -Wstrict-prototypes \
+         -Wtrampolines \
+         -Wundef \
+         -Wunused \
+         -Wvariadic-macros \
+         -Wvla \
+         -Wwrite-strings \
+         -Werror=implicit-int \
+         -Werror=implicit-function-declaration \
          -DWATT32 -DHAVE_CONFIG_H   \
+         -D_REENTRANT \
+         -DCARES_NO_DEPRECATED \
          -Dselect=select_s
 
+# Can't enable -Wredundant-decls due to WATT32 issues
+
+
 LDFLAGS = -s
 
 ifeq ($(OS),Windows_NT)

Makefile.msvc

@@ -214,7 +214,7 @@ RT_ERROR_CHECKING = /RTCsu
 
 CC_CMD_REL = cl.exe /nologo $(RTLIB) /DNDEBUG /O2
 CC_CMD_DBG = cl.exe /nologo $(RTLIBD) /D_DEBUG /Od /Zi $(RT_ERROR_CHECKING)
-CC_CFLAGS  = $(CFLAGS) /I.\src\lib /I.\include /W3 /EHsc /FD
+CC_CFLAGS  = $(CFLAGS) /D_REENTRANT /I.\src\lib /I.\include /W3 /EHsc /FD
 
 RC_CMD_REL = rc.exe /l 0x409 /d "NDEBUG"
 RC_CMD_DBG = rc.exe /l 0x409 /d "_DEBUG"

src/lib/ares__iface_ips.c

@@ -55,6 +55,9 @@
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
+#ifdef HAVE_NETDB_H
+#  include <netdb.h>
+#endif
 
 #include "ares.h"
 #include "ares_private.h"

src/lib/ares_private.h

@@ -31,11 +31,6 @@
 #  include <netinet/in.h>
 #endif
 
-#ifdef WATT32
-#  include <tcp.h>
-#  include <sys/ioctl.h>
-#endif
-
 #define DEFAULT_TIMEOUT 2000 /* milliseconds */
 #define DEFAULT_TRIES   3
 #ifndef INADDR_NONE

src/lib/config-dos.h

@@ -32,6 +32,7 @@
 #define HAVE_TIME_H              1
 #define HAVE_UNISTD_H            1
 #define HAVE_WRITEV              1
+#define HAVE_STAT                1
 
 #define NEED_MALLOC_H 1
 
@@ -73,7 +74,7 @@
 #  define HAVE_VARIADIC_MACROS_GCC 1
 
 /* Because djgpp <= 2.03 doesn't have snprintf() etc. */
-#  if (DJGPP_MINOR < 4)
+#  if defined(DJGPP_MINOR) && DJGPP_MINOR < 4
 #    define _MPRINTF_REPLACE
 #  endif
 
@@ -85,30 +86,30 @@
 #  define strerror(e)     strerror_s_((e))
 #endif
 
+/* This seems odd, can DOS build without WATT32? */
 #ifdef WATT32
-#  define HAVE_AF_INET6                   1
-#  define HAVE_ARPA_INET_H                1
-#  define HAVE_ARPA_NAMESER_H             1
-#  define HAVE_CLOSE_S                    1
-#  define HAVE_GETHOSTNAME                1
-#  define HAVE_NETDB_H                    1
-#  define HAVE_NETINET_IN_H               1
-#  define HAVE_NETINET_TCP_H              1
-#  define HAVE_PF_INET6                   1
-#  define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
-#  define HAVE_STRUCT_ADDRINFO            1
-#  define HAVE_STRUCT_IN6_ADDR            1
-#  define HAVE_STRUCT_SOCKADDR_IN6        1
-#  define HAVE_SYS_SOCKET_H               1
-#  define HAVE_SYS_UIO_H                  1
-#  define NS_INADDRSZ                     4
-#  define HAVE_STRUCT_SOCKADDR_IN6        1
-
-#  define HAVE_GETSERVBYPORT_R 1
-#  define GETSERVBYPORT_R_ARGS 5
+#  define HAVE_AF_INET6                          1
+#  define HAVE_ARPA_INET_H                       1
+#  define HAVE_ARPA_NAMESER_H                    1
+#  define HAVE_CLOSE_S                           1
+#  define HAVE_GETHOSTNAME                       1
+#  define HAVE_NETDB_H                           1
+#  define HAVE_NETINET_IN_H                      1
+#  define HAVE_NETINET_TCP_H                     1
+#  define HAVE_PF_INET6                          1
+#  define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
+#  define HAVE_STRUCT_ADDRINFO                   1
+#  define HAVE_STRUCT_IN6_ADDR                   1
+#  define HAVE_STRUCT_SOCKADDR_IN6               1
+#  define HAVE_SYS_SOCKET_H                      1
+#  define HAVE_SYS_IOCTL_H                       1
+#  define HAVE_SYS_UIO_H                         1
+#  define NS_INADDRSZ                            4
+#  define HAVE_GETSERVBYPORT_R                   1
+#  define GETSERVBYPORT_R_ARGS                   6
+#  define HAVE_WRITEV                            1
+#  define HAVE_IF_NAMETOINDEX                    1
+#  define HAVE_IF_INDEXTONAME                    1
 #endif
 
-#undef word
-#undef byte
-
 #endif /* HEADER_CONFIG_DOS_H */

src/lib/config-win32.h

@@ -219,12 +219,17 @@
 #  define HAVE_NETDB_H             1
 #  define HAVE_NETINET_IN_H        1
 #  define HAVE_SYS_SOCKET_H        1
+#  define HAVE_SYS_IOCTL_H         1
 #  define HAVE_NETINET_TCP_H       1
 #  define HAVE_AF_INET6            1
 #  define HAVE_PF_INET6            1
 #  define HAVE_STRUCT_IN6_ADDR     1
 #  define HAVE_STRUCT_SOCKADDR_IN6 1
 #  define HAVE_WRITEV              1
+#  define HAVE_IF_NAMETOINDEX      1
+#  define HAVE_IF_INDEXTONAME      1
+#  define HAVE_GETSERVBYPORT_R     1
+#  define GETSERVBYPORT_R_ARGS     6
 #  undef HAVE_WINSOCK_H
 #  undef HAVE_WINSOCK2_H
 #  undef HAVE_WS2TCPIP_H