diff --git a/src/modelconfig/configfile.h b/codes/configfile.h similarity index 100% rename from src/modelconfig/configfile.h rename to codes/configfile.h diff --git a/src/Makefile.subdir b/src/Makefile.subdir index c1ba0519a40482dc0b49af4639403970596aafce..4174681a66de634e77b4d48b11563b9c3ad8101d 100644 --- a/src/Makefile.subdir +++ b/src/Makefile.subdir @@ -91,7 +91,8 @@ nobase_include_HEADERS = \ codes/net/loggp.h \ codes/net/simplenet-upd.h \ codes/net/simplep2p.h \ - codes/net/torus.h + codes/net/torus.h \ + codes/configfile.h #codes/codes-nw-workload.h @@ -114,7 +115,6 @@ src_libcodes_a_SOURCES = \ src/modelconfig/configfile.c \ src/modelconfig/configglue.h \ src/modelconfig/configglue.c \ - src/modelconfig/configfile.h \ src/modelconfig/configstore.h \ src/modelconfig/configstore.c \ src/modelconfig/configstoreadapter.h \ diff --git a/src/modelconfig/configfile.c b/src/modelconfig/configfile.c index fb4735eca1ddae04088b691ab3887621fe435bf1..c748fdd6df18b7c914edcce723ee2cb668c36e7e 100644 --- a/src/modelconfig/configfile.c +++ b/src/modelconfig/configfile.c @@ -15,7 +15,7 @@ #include #endif -#include "configfile.h" +#include #include "txt_configfile.h" static int cf_equal_helper (struct ConfigVTable * h1, SectionHandle s1, struct ConfigVTable * h2, diff --git a/src/modelconfig/configglue.h b/src/modelconfig/configglue.h index 7d88155b653799e1bc47190b8109dea9bbe5d211..df35709d0b2fc2d2d45d5b91786ff21c1f58a1e8 100644 --- a/src/modelconfig/configglue.h +++ b/src/modelconfig/configglue.h @@ -9,7 +9,7 @@ /* Common header for parser and lexer */ -#include "configfile.h" +#include typedef struct diff --git a/src/modelconfig/configstoreadapter.h b/src/modelconfig/configstoreadapter.h index 36bb701a1fb7a304efa3c8e1e995d64ca1f5bb42..3ded27ba288b938fd47e4e524db0ab50ff4ca597 100644 --- a/src/modelconfig/configstoreadapter.h +++ b/src/modelconfig/configstoreadapter.h @@ -7,7 +7,7 @@ #ifndef SRC_COMMON_MODELCONFIG_CONFIGSTOREADAPTER_H #define SRC_COMMON_MODELCONFIG_CONFIGSTOREADAPTER_H -#include "configfile.h" +#include #include "configstore.h" #ifdef __cplusplus diff --git a/src/modelconfig/configuration.c b/src/modelconfig/configuration.c index 42fb0265c1b036f6f1e339224300b5cd6e2433e9..831493fc6bff3200c3ae6ec4f2b2991c6d8fbd44 100644 --- a/src/modelconfig/configuration.c +++ b/src/modelconfig/configuration.c @@ -13,7 +13,7 @@ #include "codes/configuration.h" #include -#include "configfile.h" +#include #include "txt_configfile.h" /* diff --git a/src/modelconfig/txt_configfile.h b/src/modelconfig/txt_configfile.h index 7610661224547a2cffb36bc338f6399f34fa9ab1..b4e82330cfbe89a07ea580218b3c055d44e5942d 100644 --- a/src/modelconfig/txt_configfile.h +++ b/src/modelconfig/txt_configfile.h @@ -9,7 +9,7 @@ #include -#include "configfile.h" +#include #ifdef __cplusplus extern "C" {