From dca035a42b66a9ea2cdda18f49be187cbf8cbfac Mon Sep 17 00:00:00 2001 From: luofeng Date: Mon, 26 Jan 2026 18:34:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8Dcmake=E7=BC=96?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ configure.ac | 2 +- src/modbus-data.c | 2 +- src/modbus-private.h | 2 +- src/modbus-tcp.c | 4 ---- src/modbus.c | 2 +- src/win32/configure.js | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8c04291..eba9c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,9 @@ Makefile.in /ltmain.sh /missing /stamp-h1 +src/config.* src/modbus-version.h +src/stamp-h1 src/win32/modbus.dll.manifest tests/unit-test.h diff --git a/configure.ac b/configure.ac index 920612f..4b880ee 100644 --- a/configure.ac +++ b/configure.ac @@ -162,7 +162,7 @@ AC_ARG_ENABLE(tests, [enable_tests=yes]) AM_CONDITIONAL(BUILD_TESTS, [test $enable_tests != no]) -AC_CONFIG_HEADERS([config.h tests/unit-test.h]) +AC_CONFIG_HEADERS([src/config.h tests/unit-test.h]) AC_CONFIG_FILES([ Makefile src/Makefile diff --git a/src/modbus-data.c b/src/modbus-data.c index 1e39004..3200d30 100644 --- a/src/modbus-data.c +++ b/src/modbus-data.c @@ -22,7 +22,7 @@ # include #endif -#include +#include "config.h" #include "modbus.h" diff --git a/src/modbus-private.h b/src/modbus-private.h index ea83187..1c88956 100644 --- a/src/modbus-private.h +++ b/src/modbus-private.h @@ -17,7 +17,7 @@ typedef int ssize_t; #endif // clang-format on -#include +#include "config.h" #include #include "modbus.h" diff --git a/src/modbus-tcp.c b/src/modbus-tcp.c index 8e5e37c..60fba88 100644 --- a/src/modbus-tcp.c +++ b/src/modbus-tcp.c @@ -42,12 +42,8 @@ # include #endif -#ifdef HAVE_NETINET_IN_H #include -#endif /* HAVE_NETINET_IN_H */ -#ifdef HAVE_NETINET_IP_H #include -#endif /* HAVE_NETINET_IP_H */ # include # include # include diff --git a/src/modbus.c b/src/modbus.c index e3737bb..da70371 100644 --- a/src/modbus.c +++ b/src/modbus.c @@ -18,7 +18,7 @@ #include #endif -#include +#include "config.h" #include "modbus-private.h" #include "modbus.h" diff --git a/src/win32/configure.js b/src/win32/configure.js index 5a579b9..23249ff 100644 --- a/src/win32/configure.js +++ b/src/win32/configure.js @@ -165,7 +165,7 @@ if (error !== 0) { } WScript.Echo(newfile + " created."); -newfile = "config.h"; +newfile = srcDir + "\\config.h"; createVersionedFile(newfile, "config.h.win32"); if (error !== 0) { WScript.Echo("Creation of " + newfile + " failed, aborting."); -- Gitee