Commit 7871b28c authored by Philip Carns's avatar Philip Carns

fix config.h usage and clean up warnings

parent e421b386
...@@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects -Wall]) ...@@ -13,7 +13,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects -Wall])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_SRCDIR([README.txt]) AC_CONFIG_SRCDIR([README.txt])
AC_CONFIG_HEADERS([codes_config.h]) AC_CONFIG_HEADERS([codes_base_config.h])
AX_PROG_BISON([],[AC_MSG_WARN([Could not find bison])]) AX_PROG_BISON([],[AC_MSG_WARN([Could not find bison])])
AX_PROG_FLEX([],[AC_MSG_WARN([Could not find flex])]) AX_PROG_FLEX([],[AC_MSG_WARN([Could not find flex])])
......
#ifndef SRC_COMMON_MODELCONFIG_CONFIGFILE_H #ifndef SRC_COMMON_MODELCONFIG_CONFIGFILE_H
#define SRC_COMMON_MODELCONFIG_CONFIGFILE_H #define SRC_COMMON_MODELCONFIG_CONFIGFILE_H
#include "codes_base_config.h"
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H
#include <malloc.h> #include <malloc.h>
#endif #endif
......
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include "codes_base_config.h"
#include "configstore.h"
#ifdef HAVE_MALLOC_H #ifdef HAVE_MALLOC_H
#include <malloc.h> #include <malloc.h>
#endif #endif
#include "configstore.h" #ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
struct mcs_entry struct mcs_entry
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment