summaryrefslogtreecommitdiff
path: root/packages/OS400
diff options
context:
space:
mode:
authorViktor Szakats <commit@vsz.me>2022-10-06 15:30:13 +0000
committerViktor Szakats <commit@vsz.me>2022-10-06 15:30:13 +0000
commit0c327464caa0a2d799145bab546f89ebb559ec09 (patch)
tree10949f04ae4bd66452b2003295155ec2cae6c6a5 /packages/OS400
parent6d90308a39dd5ca699cb9db6d73f687b7639a340 (diff)
downloadcurl-0c327464caa0a2d799145bab546f89ebb559ec09.tar.gz
tidy-up: delete parallel/unused feature flags
Detecting headers and lib separately makes sense when headers come in variations or with extra ones, but this wasn't the case here. These were duplicate/parallel macros that we had to keep in sync with each other for a working build. This patch leaves a single macro for each of these dependencies: - Rely on `HAVE_LIBZ`, delete parallel `HAVE_ZLIB_H`. Also delete CMake logic making sure these two were in sync, along with a toggle to turn off that logic, called `CURL_SPECIAL_LIBZ`. Also delete stray `HAVE_ZLIB` defines. There is also a `USE_ZLIB` variant in `lib/config-dos.h`. This patch retains it for compatibility and deprecates it. - Rely on `USE_LIBSSH2`, delete parallel `HAVE_LIBSSH2_H`. Also delete `LIBSSH2_WIN32`, `LIBSSH2_LIBRARY` from `winbuild/MakefileBuild.vc`, these have a role when building libssh2 itself. And `CURL_USE_LIBSSH`, which had no use at all. Also delete stray `HAVE_LIBSSH2` defines. - Rely on `USE_LIBSSH`, delete parallel `HAVE_LIBSSH_LIBSSH_H`. Also delete `LIBSSH_WIN32`, `LIBSSH_LIBRARY` and `HAVE_LIBSSH` from `winbuild/MakefileBuild.vc`, these were the result of copy-pasting the libssh2 line, and were not having any use. - Delete unused `HAVE_LIBPSL_H` and `HAVE_LIBPSL`. Reviewed-by: Daniel Stenberg Closes #9652
Diffstat (limited to 'packages/OS400')
-rw-r--r--packages/OS400/initscript.sh4
-rw-r--r--packages/OS400/os400sys.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/OS400/initscript.sh b/packages/OS400/initscript.sh
index f1d13f476..4facf17ed 100644
--- a/packages/OS400/initscript.sh
+++ b/packages/OS400/initscript.sh
@@ -237,11 +237,11 @@ make_module()
DEFINES="${3} BUILDING_LIBCURL"
if [ "${WITH_ZLIB}" != "0" ]
- then DEFINES="${DEFINES} HAVE_LIBZ HAVE_ZLIB_H"
+ then DEFINES="${DEFINES} HAVE_LIBZ"
fi
if [ "${WITH_LIBSSH2}" != "0" ]
- then DEFINES="${DEFINES} USE_LIBSSH2 HAVE_LIBSSH2_H"
+ then DEFINES="${DEFINES} USE_LIBSSH2"
fi
if [ "${DEFINES}" ]
diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 754d609d3..862c7fd38 100644
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -40,7 +40,7 @@
#include <qadrt.h>
#include <errno.h>
-#ifdef HAVE_ZLIB_H
+#ifdef HAVE_LIBZ
#include <zlib.h>
#endif