INI Correcting build warnings.

The previous patch included "config.h"
into the public header which caused all sorts
of redefinitions and warnings.

2 files changed, 7 insertions, 8 deletions

diff --git a/common/ini/ini_config.c b/common/ini/ini_config.c
index 6766dfad6..17cb53b10 100644
--- a/common/ini/ini_config.c
+++ b/common/ini/ini_config.c
@@ -76,6 +76,11 @@
 #define INI_ERROR       "errors"
 #define INI_ERROR_NAME  "errname"
 
+
+/* Internal sizes. MAX_KEY is defined in config.h */
+#define MAX_VALUE       PATH_MAX
+#define BUFFER_SIZE     MAX_KEY + MAX_VALUE + 3
+
 /* Internally used functions */
 static int config_with_lines(const char *application,
                              FILE *config_file,
@@ -111,7 +116,7 @@ const char *parsing_error_str(int parsing_error)
 }
 
 /* Function to return grammar error.
- * This functions is currently not used.
+ * This function is currently not used.
  * It is planned to be used by the INI
  * file grammar parser.
  */
@@ -136,7 +141,7 @@ const char *grammar_error_str(int grammar_error)
 }
 
 /* Function to return validation error.
- * This functions is currently not used.
+ * This function is currently not used.
  * It is planned to be used by the INI
  * file grammar validator.
  */
diff --git a/common/ini/ini_config.h b/common/ini/ini_config.h
index f7e041535..12d4a8092 100644
--- a/common/ini/ini_config.h
+++ b/common/ini/ini_config.h
@@ -26,7 +26,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include "collection.h"
-#include "config.h"
 
 /* Name of the default (missing section in the INI file */
 #define INI_DEFAULT_SECTION "default"
@@ -68,11 +67,6 @@
 #define ERR_MAXVALID        0
 
 
-
-/* Internal sizes. MAX_KEY is defined in config.h */
-#define MAX_VALUE       PATH_MAX
-#define BUFFER_SIZE     MAX_KEY + MAX_VALUE + 3
-
 struct parse_error {
     unsigned line;
     int error;