From 0875c01adc4b66029a60f0f1b3d92a99041e1546 Mon Sep 17 00:00:00 2001 From: John Jenkins Date: Tue, 14 Jun 2016 08:47:50 -0500 Subject: [PATCH] promote configfile to public API --- {src/modelconfig => codes}/configfile.h | 0 src/Makefile.subdir | 4 ++-- src/modelconfig/configfile.c | 2 +- src/modelconfig/configglue.h | 2 +- src/modelconfig/configstoreadapter.h | 2 +- src/modelconfig/configuration.c | 2 +- src/modelconfig/txt_configfile.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename {src/modelconfig => codes}/configfile.h (100%) 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 c1ba051..4174681 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 fb4735e..c748fdd 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 7d88155..df35709 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 36bb701..3ded27b 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 42fb026..831493f 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 7610661..b4e8233 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" { -- 2.26.2