[mdb-dev] OSX Patch

[Paul S. <po...@ma...>]

Hi all,

Apologies for the long mail ! I have developed this patch to get 
mdbtools running on OSX so are submitting it for possible inclusion. If 
I have got it wrong please tell me so I can fix it, I'm not much of a C 
coder :-)

CHEERS
Paul

diff -urN mdbtools-0.5rc2/include/mdbsql.h 
mdbtools-0.5rc2mac/include/mdbsql.h
--- mdbtools-0.5rc2/include/mdbsql.h	Thu Mar 28 00:00:01 2002
+++ mdbtools-0.5rc2mac/include/mdbsql.h	Thu Feb 13 22:24:06 2003
@@ -3,6 +3,12 @@
  #include <glib.h>
  #include <mdbtools.h>

+#ifdef MAIN
+#define EXTERN
+#else
+#define EXTERN extern
+#endif
+
  #ifndef _mdbsql_h_
  #define _mdbsql_h_

@@ -39,7 +45,7 @@
  	MdbSarg *sarg;
  } MdbSQLSarg;

-char *g_input_ptr;
+EXTERN char *g_input_ptr;

  #undef YY_INPUT
  #define YY_INPUT(b, r, ms) (r = mdb_sql_yyinput(b, ms));
diff -urN mdbtools-0.5rc2/include/mdbtools.h 
mdbtools-0.5rc2mac/include/mdbtools.h
--- mdbtools-0.5rc2/include/mdbtools.h	Mon Jan 13 09:59:42 2003
+++ mdbtools-0.5rc2mac/include/mdbtools.h	Thu Feb 13 22:23:42 2003
@@ -17,6 +17,12 @@
   * Boston, MA 02111-1307, USA.
   */

+#ifdef MAIN
+#define EXTERN
+#else
+#define EXTERN extern
+#endif
+
  #ifndef _mdbtools_h_
  #define _mdbtools_h_

@@ -110,7 +116,7 @@
  #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)

  /* hash to store registered backends */
-GHashTable	*mdb_backends;
+EXTERN GHashTable	*mdb_backends;

  typedef struct {
  	char **types_table;
diff -urN mdbtools-0.5rc2/src/gmdb2/main2.c 
mdbtools-0.5rc2mac/src/gmdb2/main2.c
--- mdbtools-0.5rc2/src/gmdb2/main2.c	Wed Jan 15 13:02:07 2003
+++ mdbtools-0.5rc2mac/src/gmdb2/main2.c	Thu Feb 13 22:28:34 2003
@@ -15,6 +15,7 @@
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
   */
+#define MAIN
  #include <gnome.h>
  #include <libgnome/gnome-help.h>
  #include <glade/glade.h>
diff -urN mdbtools-0.5rc2/src/util/mdb-array.c 
mdbtools-0.5rc2mac/src/util/mdb-array.c
--- mdbtools-0.5rc2/src/util/mdb-array.c	Tue Aug 13 03:37:05 2002
+++ mdbtools-0.5rc2mac/src/util/mdb-array.c	Thu Feb 13 22:24:52 2003
@@ -21,6 +21,7 @@
  /* this is inherited from mdb-export.c, modified to make arrays 
similar to
     those generated by parsecsv.c */

+#define MAIN
  #include "mdbtools.h"

  main (int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/mdb-export.c 
mdbtools-0.5rc2mac/src/util/mdb-export.c
--- mdbtools-0.5rc2/src/util/mdb-export.c	Wed Dec 11 10:35:25 2002
+++ mdbtools-0.5rc2mac/src/util/mdb-export.c	Thu Feb 13 22:25:09 2003
@@ -18,6 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */

+#define MAIN
  #include "mdbtools.h"

  #define is_text_type(x) (x==MDB_TEXT || x==MDB_MEMO || 
x==MDB_SDATETIME)
diff -urN mdbtools-0.5rc2/src/util/mdb-header.c 
mdbtools-0.5rc2mac/src/util/mdb-header.c
--- mdbtools-0.5rc2/src/util/mdb-header.c	Tue Aug 13 03:37:05 2002
+++ mdbtools-0.5rc2mac/src/util/mdb-header.c	Thu Feb 13 22:25:18 2003
@@ -19,6 +19,7 @@
  /* this utility dumps the C headers for an existing database */
  /* it will create three files - types.h and dump_types.[ch] */

+#define MAIN
  #include "mdbtools.h"
  #include <string.h>

diff -urN mdbtools-0.5rc2/src/util/mdb-schema.c 
mdbtools-0.5rc2mac/src/util/mdb-schema.c
--- mdbtools-0.5rc2/src/util/mdb-schema.c	Tue Dec 31 03:38:52 2002
+++ mdbtools-0.5rc2mac/src/util/mdb-schema.c	Thu Feb 13 22:25:43 2003
@@ -18,6 +18,7 @@

  /* this utility dumps the schema for an existing database */

+#define MAIN
  #include "mdbtools.h"

  main (int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/mdb-sql.c 
mdbtools-0.5rc2mac/src/util/mdb-sql.c
--- mdbtools-0.5rc2/src/util/mdb-sql.c	Mon Jan  6 01:58:33 2003
+++ mdbtools-0.5rc2mac/src/util/mdb-sql.c	Thu Feb 13 22:37:42 2003
@@ -21,6 +21,7 @@
  #ifdef HAVE_READLINE
  #include <readline/readline.h>
  #endif
+#define MAIN
  #include <string.h>
  #include "mdbsql.h"

diff -urN mdbtools-0.5rc2/src/util/mdb-tables.c 
mdbtools-0.5rc2mac/src/util/mdb-tables.c
--- mdbtools-0.5rc2/src/util/mdb-tables.c	Mon Jan  6 10:49:57 2003
+++ mdbtools-0.5rc2mac/src/util/mdb-tables.c	Thu Feb 13 22:25:52 2003
@@ -18,6 +18,7 @@

  /* this utility dumps the schema for an existing database */

+#define MAIN
  #include "mdbtools.h"

  main (int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/mdb-ver.c 
mdbtools-0.5rc2mac/src/util/mdb-ver.c
--- mdbtools-0.5rc2/src/util/mdb-ver.c	Thu Jan  2 09:29:42 2003
+++ mdbtools-0.5rc2mac/src/util/mdb-ver.c	Thu Feb 13 22:25:56 2003
@@ -18,6 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */

+#define MAIN
  #include "mdbtools.h"

  main(int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/prcat.c 
mdbtools-0.5rc2mac/src/util/prcat.c
--- mdbtools-0.5rc2/src/util/prcat.c	Tue Aug 13 03:37:05 2002
+++ mdbtools-0.5rc2mac/src/util/prcat.c	Thu Feb 13 22:26:00 2003
@@ -16,6 +16,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
   */

+#define MAIN
  #include "mdbtools.h"

  main(int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/prdata.c 
mdbtools-0.5rc2mac/src/util/prdata.c
--- mdbtools-0.5rc2/src/util/prdata.c	Tue Aug 13 03:37:05 2002
+++ mdbtools-0.5rc2mac/src/util/prdata.c	Thu Feb 13 22:26:04 2003
@@ -18,6 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */

+#define MAIN
  #include "mdbtools.h"

  main(int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/prdump.c 
mdbtools-0.5rc2mac/src/util/prdump.c
--- mdbtools-0.5rc2/src/util/prdump.c	Tue Aug 13 03:37:05 2002
+++ mdbtools-0.5rc2mac/src/util/prdump.c	Thu Feb 13 22:26:10 2003
@@ -18,6 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */

+#define MAIN
  #include "mdbtools.h"

  main(int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/prindex.c 
mdbtools-0.5rc2mac/src/util/prindex.c
--- mdbtools-0.5rc2/src/util/prindex.c	Mon Jan 13 09:59:44 2003
+++ mdbtools-0.5rc2mac/src/util/prindex.c	Thu Feb 13 22:26:14 2003
@@ -18,6 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */

+#define MAIN
  #include "mdbtools.h"
  extern char idx_to_text[];

diff -urN mdbtools-0.5rc2/src/util/prkkd.c 
mdbtools-0.5rc2mac/src/util/prkkd.c
--- mdbtools-0.5rc2/src/util/prkkd.c	Tue Aug 13 03:37:05 2002
+++ mdbtools-0.5rc2mac/src/util/prkkd.c	Thu Feb 13 22:26:18 2003
@@ -16,6 +16,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  
02111-1307  USA
   */

+#define MAIN
  #include "mdbtools.h"

  main(int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/prole.c 
mdbtools-0.5rc2mac/src/util/prole.c
--- mdbtools-0.5rc2/src/util/prole.c	Mon Jan  6 01:58:33 2003
+++ mdbtools-0.5rc2mac/src/util/prole.c	Thu Feb 13 22:26:22 2003
@@ -18,6 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */

+#define MAIN
  #include "mdbtools.h"

  void dump_ole(MdbTableDef *table, char *colname, char *sargname);
diff -urN mdbtools-0.5rc2/src/util/prtable.c 
mdbtools-0.5rc2mac/src/util/prtable.c
--- mdbtools-0.5rc2/src/util/prtable.c	Tue Aug 13 03:37:05 2002
+++ mdbtools-0.5rc2mac/src/util/prtable.c	Thu Feb 13 22:26:26 2003
@@ -18,6 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */

+#define MAIN
  #include "mdbtools.h"

  main(int argc, char **argv)
diff -urN mdbtools-0.5rc2/src/util/updrow.c 
mdbtools-0.5rc2mac/src/util/updrow.c
--- mdbtools-0.5rc2/src/util/updrow.c	Thu Jan  2 09:29:42 2003
+++ mdbtools-0.5rc2mac/src/util/updrow.c	Thu Feb 13 22:26:33 2003
@@ -18,6 +18,7 @@
   * Boston, MA 02111-1307, USA.
   */

+#define MAIN
  #include "mdbtools.h"

  void read_to_row(MdbTableDef *table, char *sargname);