Include config.h in all .c files

Need to be the first file since it may define large files support
and other options.

src/extras/mdb-dump.c

@@ -1,4 +1,6 @@
 /* utility program to make a hex dump of a binary file (such as a mdb file) */
+
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

src/extras/mdbsupport.c

@@ -1,5 +1,6 @@
 /* support routines for code generated by the util programs */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 

src/gmdb/gmdb.h

@@ -1,17 +1,16 @@
-#include <mdbtools.h>
+#ifndef _gmdb_h_
-#include <mdbsql.h>
+#define _gmdb_h_
+
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <gtk/gtk.h>
-
 #ifdef HAVE_GNOME
 #include <gnome.h>
 #endif
-
+#include "mdbtools.h"
-#ifndef _gmdb_h_
+#include "mdbsql.h"
-#define _gmdb_h_
 
 #ifdef __cplusplus
 extern "C" {

src/gmdb2/debug.c

@@ -23,11 +23,11 @@
  *   gboolean *dissect: whether dissecting is turned on
  */ 
 
-#include "gmdb.h"
+#include "config.h"
-
 #include <glade/glade.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
+#include "gmdb.h"
 
 extern MdbHandle *mdb;
 

src/gmdb2/file.c

@@ -15,14 +15,15 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "gmdb.h"
 
-#include <mdbtools.h>
+#include "config.h"
 #include <gtk/gtkiconview.h>
 #include <gtk/gtkliststore.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-config.h>
+#include "mdbtools.h"
+#include "gmdb.h"
 
 MdbHandle *mdb;
 extern int main_show_debug;

src/gmdb2/gmdb.h

@@ -1,14 +1,14 @@
-#include <mdbtools.h>
+#ifndef _gmdb_h_
-#include <mdbsql.h>
+#define _gmdb_h_
+
 #include <assert.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-
+#include "mdbtools.h"
-#ifndef _gmdb_h_
+#include "mdbsql.h"
-#define _gmdb_h_
 
 #ifdef __cplusplus
 extern "C" {

src/gmdb2/info.c

@@ -15,6 +15,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#include "config.h"
 #include "gmdb.h"
 
 extern GtkWidget *app;

src/gmdb2/main2.c

@@ -15,12 +15,14 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#include "config.h"
 #include <gnome.h>
 #include <libgnome/gnome-help.h>
 #include <glade/glade.h>
-#include <mdbtools.h>
+#include "mdbtools.h"
-#include <mdbver.h>
+#include "mdbver.h"
-#include <mdbsql.h>
+#include "mdbsql.h"
 #include "gmdb.h"
 
 GtkWidget *app;

src/gmdb2/prefs.c

@@ -15,10 +15,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "gmdb.h"
 
+#include "config.h"
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-help.h>
+#include "gmdb.h"
 
 extern GtkWidget *app;
 extern MdbHandle *mdb;

src/gmdb2/schema.c

@@ -15,11 +15,12 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "gmdb.h"
 
+#include "config.h"
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-help.h>
+#include "gmdb.h"
 
 extern GtkWidget *app;
 extern MdbHandle *mdb;

src/gmdb2/sql.c

@@ -15,10 +15,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "gmdb.h"
 
+#include "config.h"
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
+#include "gmdb.h"
 
 #if SQL
 

src/gmdb2/table.c

@@ -15,10 +15,11 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "gmdb.h"
 
+#include "config.h"
 #include <gtk/gtkiconview.h>
 #include <glade/glade.h>
+#include "gmdb.h"
 
 extern GladeXML* mainwin_xml;
 extern MdbHandle *mdb;

src/gmdb2/table_data.c

@@ -15,6 +15,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#include "config.h"
 #include "gmdb.h"
 
 extern GtkWidget *app;

src/gmdb2/table_def.c

@@ -15,6 +15,8 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#include "config.h"
 #include "gmdb.h"
 
 #define COL_PK 0

src/gmdb2/table_export.c

@@ -15,12 +15,13 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "gmdb.h"
 
+#include "config.h"
 #include <gtk/gtk.h>
 #include <gtk/gtkmessagedialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-help.h>
+#include "gmdb.h"
 
 extern GtkWidget *app;
 extern MdbHandle *mdb;

src/libmdb/backend.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #ifdef JAVA
 #include "javadefines.h"
 #define MdbBackendType_STRUCT_ELEMENT(a,b,c,d) new MdbBackendType(a,b,c,d)

src/libmdb/catalog.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/data.c

@@ -16,9 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include <time.h>
+#include <math.h>
 #include "mdbtools.h"
-#include "time.h"
-#include "math.h"
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/libmdb/dump.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>

src/libmdb/file.c

@@ -16,8 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "mdbtools.h"
+#include "config.h"
 #include <inttypes.h>
+#include "mdbtools.h"
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/libmdb/iconv.c

@@ -16,8 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
+#include <errno.h>
 #include "mdbtools.h"
-#include "errno.h"
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/libmdb/index.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/like.c

@@ -16,9 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include <mdbtools.h>
+#include "mdbtools.h"
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/libmdb/map.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/mem.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 MDB_DEPRECATED(void,

src/libmdb/money.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include <stdio.h>
 #include "mdbtools.h"
 

src/libmdb/options.c

@@ -16,12 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
-
+#include "mdbtools.h"
-#include <mdbtools.h>
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/libmdb/props.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 static GPtrArray *

src/libmdb/sargs.c

@@ -26,8 +26,10 @@
  * datatype support is a bit weak at this point.  To add more types create
  * a mdb_test_[type]() function and invoke it from mdb_test_sarg()
  */
-#include "mdbtools.h"
+
+#include "config.h"
 #include <time.h>
+#include "mdbtools.h"
 #ifdef DMALLOC
 #include "dmalloc.h"
 #endif

src/libmdb/stats.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/table.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/worktable.c

@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/libmdb/write.c

@@ -16,10 +16,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "mdbtools.h"
+#include "config.h"
-#include "time.h"
+#include <time.h>
-#include "math.h"
+#include <math.h>
 #include <inttypes.h>
+#include "mdbtools.h"
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/odbc/connectparams.c

@@ -18,16 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <ctype.h>
-
 #include "connectparams.h"
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 /*
  *  * Last resort place to check for INI file. This is usually set at compile time

src/odbc/connectparams.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _ODBC_INI_LOAD_
+#ifndef _connectparams_h_
-#define _ODBC_INI_LOAD_
+#define _connectparams_h_
 
 #include <glib.h>
 

src/odbc/mdbodbc.h

@@ -16,12 +16,10 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
 #ifndef _mdbodbc_h_
 #define _mdbodbc_h_
 
-#include <mdbtools.h>
-#include <mdbsql.h>
-
 #include <sql.h>
 #include <sqlext.h>
 #if defined(UNIXODBC)
@@ -30,6 +28,8 @@
 # include <iodbcinst.h>
 #endif
 
+#include "mdbtools.h"
+#include "mdbsql.h"
 #include "connectparams.h"
 
 #ifdef __cplusplus

src/odbc/odbc.c

@@ -26,6 +26,7 @@
 #define UNICODE
 #endif //ENABLE_ODBC_W
 
+#include "config.h"
 #include <sql.h>
 #include <sqlext.h>
 #include <string.h>

src/odbc/unittest.c

@@ -17,11 +17,11 @@
  */
 
 /* #include <windows.h> */
+#include "config.h"
+#include <stdio.h>
 #include <sql.h>
 #include <sqlext.h>
 
-#include <stdio.h>
-
 
 #define SALES_PERSON_LEN 2
 #define STATUS_LEN 6

src/sql/mdbsql.c

@@ -16,8 +16,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "mdbsql.h"
+#include "config.h"
 #include <stdarg.h>
+#include "mdbsql.h"
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/util/mdb-array.c

@@ -19,6 +19,7 @@
 /* this is inherited from mdb-export.c, modified to make arrays similar to
    those generated by parsecsv.c */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/util/mdb-check.c

@@ -18,6 +18,7 @@
 
 /* this utility dumps the schema for an existing database */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/util/mdb-export.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/util/mdb-header.c

@@ -18,8 +18,10 @@
 
 /* this utility dumps the C headers for an existing database */
 /* it will create three files - types.h and dump_types.[ch] */
-#include "mdbtools.h"
+
+#include "config.h"
 #include <string.h>
+#include "mdbtools.h"
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/util/mdb-import.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #define MAX_ROW_SIZE 4096

src/util/mdb-parsecsv.c

@@ -19,6 +19,8 @@
 /* this utility converts a CSV from an existing database to a C file */
 /* input FOO.txt, output FOO.c */
 /* generates an array of type FOO */
+
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/util/mdb-prop.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 void dump_kkd(MdbHandle *mdb, void *kkd, size_t len);

src/util/mdb-schema.c

@@ -17,6 +17,7 @@
  */
 
 /* this utility dumps the schema for an existing database */
+#include "config.h"
 #include <ctype.h>
 #include <getopt.h>
 #include "mdbtools.h"

src/util/mdb-sql.c

@@ -16,8 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <config.h>
+#include "config.h"
-
 #include <stdio.h>
 
 #ifdef HAVE_LIBREADLINE

src/util/mdb-tables.c

@@ -17,6 +17,8 @@
  */
 
 /* this utility dumps the schema for an existing database */
+
+#include "config.h"
 #include "mdbtools.h"
 
 #ifdef DMALLOC

src/util/mdb-ver.c

@@ -16,10 +16,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+#include <locale.h>
 #include "mdbtools.h"
 #include "mdbver.h"
 #include "mdbprivate.h"
-#include <locale.h>
 
 #ifdef DMALLOC
 #include "dmalloc.h"

src/util/prcat.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prdata.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prdump.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prfreemap.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prindex.c

@@ -16,7 +16,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
+
 extern char idx_to_text[];
 
 void walk_index(MdbHandle *mdb, MdbIndex *idx);

src/util/prkkd.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/prole.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 void dump_ole(MdbTableDef *table, char *colname, char *sargname);

src/util/prtable.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 int

src/util/sargtest.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 #define TABLE_NAME "Orders"

src/util/updrow.c

@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mdbtools.h"
 
 void read_to_row(MdbTableDef *table, char *sargname);