Misc. fixes to allow building on multiple platforms

Remove some obsolete platform macros.
Netatalk · Aug 2, 2024 · 5a35730 · 5a35730
1 parent a15b8ca
commit 5a35730
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -118,9 +118,9 @@ jobs:
       - name: Configure
         run: |
           meson setup build \
+            -Dwith-appletalk=true \
             -Dwith-init-style=openrc \
             -Dwith-pgp-uam=true \
-            -Dwith-appletalk=true \
             -Dwith-tests=true
       - name: Build
         run: meson compile -C build
@@ -158,11 +158,11 @@ jobs:
       - name: Configure
         run: |
           meson setup build \
+            -Dwith-appletalk=true \
             -Dwith-docbook-path=/usr/share/xml/docbook/xsl-stylesheets-1.79.2 \
             -Dwith-init-hooks=false \
             -Dwith-init-style=systemd \
             -Dwith-pgp-uam=true \
-            -Dwith-appletalk=true \
             -Dwith-tests=true
       - name: Build
         run: meson compile -C build
@@ -187,9 +187,9 @@ jobs:
       - name: Configure
         run: |
           meson setup build \
+            -Dwith-appletalk=true \
             -Dwith-init-hooks=false \
             -Dwith-pgp-uam=true \
-            -Dwith-appletalk=true \
             -Dwith-pkgconfdir-path=/etc/netatalk \
             -Dwith-tests=true
       - name: Build
@@ -244,10 +244,10 @@ jobs:
       - name: Configure
         run: |
           meson setup build \
+            -Dwith-appletalk=true \
             -Dwith-init-hooks=false \
             -Dwith-init-style=redhat-systemd \
             -Dwith-pgp-uam=true \
-            -Dwith-appletalk=true \
             -Dwith-tests=true
       - name: Build
         run: meson compile -C build
@@ -301,11 +301,11 @@ jobs:
       - name: Configure
         run: |
           meson setup build \
+            -Dwith-appletalk=true \
             -Dwith-docbook-path=/usr/share/xml/docbook/stylesheet/nwalsh/1.79.2 \
             -Dwith-init-hooks=false \
             -Dwith-init-style=suse-systemd \
             -Dwith-pgp-uam=true \
-            -Dwith-appletalk=true \
             -Dwith-tests=true
       - name: Build
         run: meson compile -C build
@@ -328,9 +328,9 @@ jobs:
       - name: Configure
         run: |
           meson setup build \
+            -Dwith-appletalk=true \
             -Dwith-init-hooks=false \
             -Dwith-pgp-uam=true \
-            -Dwith-appletalk=true \
             -Dwith-tests=true
       - name: Build
         run: meson compile -C build
@@ -384,8 +384,8 @@ jobs:
             set -e
             wget https://www.unicode.org/Public/UNIDATA/UnicodeData.txt
             meson setup build \
-              -Dwith-pgp-uam=true \
-              -Dwith-appletalk=true
+              -Dwith-appletalk=true \
+              -Dwith-pgp-uam=true
             meson compile -C build
             meson install -C build
             ninja -C build uninstall
@@ -425,9 +425,9 @@ jobs:
             set -e
             wget https://www.unicode.org/Public/UNIDATA/UnicodeData.txt
             meson setup build \
+              -Dwith-appletalk=true \
               -Dpkg_config_path=/usr/local/libdata/pkgconfig \
-              -Dwith-pgp-uam=true \
-              -Dwith-appletalk=true
+              -Dwith-pgp-uam=true
             meson compile -C build
             meson install -C build
             /usr/local/etc/rc.d/netatalk start
@@ -475,10 +475,10 @@ jobs:
           run: |
             set -e
             meson setup build \
+              -Dwith-appletalk=true \
               -Dpkg_config_path=/usr/pkg/lib/pkgconfig \
               -Dwith-dtrace=false \
               -Dwith-pgp-uam=true \
-              -Dwith-appletalk=true \
               -Dwith-tests=true
             meson compile -C build
             cd build && meson test
@@ -604,10 +604,10 @@ jobs:
             export PATH=/opt/local/sbin:/opt/local/bin:/usr/gnu/bin:/usr/bin:/usr/sbin:/sbin:$PATH
             wget https://www.unicode.org/Public/UNIDATA/UnicodeData.txt
             meson setup build \
+              -Dwith-appletalk=true \
               -Dpkg_config_path=/opt/local/lib/pkgconfig \
               -Dwith-ldap-path=/opt/local \
-              -Dwith-pgp-uam=true \
-              -Dwith-appletalk=true
+              -Dwith-pgp-uam=true
             meson compile -C build
             meson install -C build
             svcadm enable svc:/network/netatalk:default
@@ -645,10 +645,10 @@ jobs:
             set -e
             wget https://www.unicode.org/Public/UNIDATA/UnicodeData.txt
             meson setup build \
+              -Dwith-appletalk=true \
               -Dpkg_config_path=/usr/lib/amd64/pkgconfig \
               -Dwith-docbook-path=/usr/share/sgml/docbook/xsl-stylesheets \
               -Dwith-pgp-uam=true \
-              -Dwith-appletalk=true \
               -Dwith-tests=true
             meson compile -C build
             cd build && meson test
@@ -682,9 +682,9 @@ jobs:
         run: |
           mkdir -p ${{ env.BUILD_WRAPPER_OUT_DIR }}
           meson setup build \
+            -Dwith-appletalk=true \
             -Dwith-init-style=none \
             -Dwith-pgp-uam=true \
-            -Dwith-appletalk=true \
             -Dwith-tests=true
           build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} meson compile -C build
       - name: Run sonar-scanner

diff --git a/contrib/a2boot/a2boot.c b/contrib/a2boot/a2boot.c
@@ -50,12 +50,7 @@
 #include <netdb.h>
 #endif /* HAVE_NETDB_H */
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#ifdef HAVE_SYS_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_SYS_FCNTL_H */
 
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>

diff --git a/contrib/timelord/timelord.c b/contrib/timelord/timelord.c
@@ -45,12 +45,7 @@
 #include <netdb.h>
 #endif /* HAVE_NETDB_H */
 
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
-#ifdef HAVE_SYS_FCNTL_H
-#include <fcntl.h>
-#endif /* HAVE_SYS_FCNTL_H */
 
 #include <termios.h>
 #include <sys/ioctl.h>

diff --git a/etc/papd/main.c b/etc/papd/main.c
@@ -18,9 +18,7 @@
 
 /* POSIX.1 sys/wait.h check */
 #include <sys/types.h>
-#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
-#endif /* HAVE_SYS_WAIT_H */
 #ifndef WEXITSTATUS
 #define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 #endif /* ! WEXITSTATUS */

diff --git a/include/atalk/rtmp.h b/include/atalk/rtmp.h
@@ -43,4 +43,4 @@ struct rtmprdhdr {
     u_int8_t    rrdh_id;
 };
 
-#endif
+#endif
diff --git a/libatalk/asp/asp_getsess.c b/libatalk/asp/asp_getsess.c
@@ -20,9 +20,7 @@
 #include <sys/uio.h>
 #include <sys/socket.h>
 #include <sys/param.h>
-#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
-#endif /* HAVE_SYS_WAIT_H */
 
 #include <netatalk/at.h>
 #include <atalk/logger.h>

diff --git a/libatalk/util/atalk_addr.c b/libatalk/util/atalk_addr.c
@@ -119,4 +119,4 @@ int atalk_aton(char* cp, struct at_addr* addr)
 	return (1);
 }
 
-#endif  /* NO_DDP */
+#endif  /* NO_DDP */