From e26a98a763a5ada432d341abb3f86cf4227c899a Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Tue, 4 Dec 2007 23:52:08 +0000
Subject: [PATCH] 2007-12-04  Mike Kestner  <mkestner@novell.com>

	* configure.in.in: check for default off_t size
	* generator/SymbolTable.cs: map off_t based on configure check.
	* generator/Makefile.am: add OFF_T_FLAGS to compile.

svn path=/trunk/gtk-sharp/; revision=90727
---
 ChangeLog                | 6 ++++++
 configure.in.in          | 4 ++++
 generator/Makefile.am    | 2 +-
 generator/SymbolTable.cs | 6 +++++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 39b50e4ab..3f1343fb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-04  Mike Kestner  <mkestner@novell.com>
+
+	* configure.in.in: check for default off_t size
+	* generator/SymbolTable.cs: map off_t based on configure check.
+	* generator/Makefile.am: add OFF_T_FLAGS to compile.
+
 2007-12-03  Mark Probst  <mark.probst@gmail.com>
 
 	* generator/SymbolTable.cs: Added "where" to the list of mangled
diff --git a/configure.in.in b/configure.in.in
index e822cee7a..33a3d28a0 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -96,6 +96,10 @@ BUILD_GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
 AC_SUBST(BUILD_GTK_CFLAGS)
 AC_SUBST(BUILD_GTK_LIBS)
 
+AC_CHECK_SIZEOF(off_t)
+OFF_T_FLAGS="-define:OFF_T_$ac_cv_sizeof_off_t"
+AC_SUBST(OFF_T_FLAGS)
+
 MONO_REQUIRED_VERSION=1.0
 PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 
diff --git a/generator/Makefile.am b/generator/Makefile.am
index 171bf1b04..b4f4998f9 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -64,5 +64,5 @@ EXTRA_DIST =					\
 	$(dist_sources)
 
 gapi_codegen.exe: $(build_sources)
-	$(CSC) /out:gapi_codegen.exe $(references) $(build_sources)
+	$(CSC) /out:gapi_codegen.exe $(OFF_T_FLAGS) $(references) $(build_sources)
 
diff --git a/generator/SymbolTable.cs b/generator/SymbolTable.cs
index 9296d4f93..f49ca64e6 100644
--- a/generator/SymbolTable.cs
+++ b/generator/SymbolTable.cs
@@ -85,7 +85,11 @@ namespace GtkSharp.Generation {
 			AddType (new LPUGen ("ulong"));
 			AddType (new LPUGen ("gulong"));
 			AddType (new LPUGen ("gsize"));
-			AddType (new AliasGen ("off_t", "ssize_t"));
+#if OFF_T_8
+			AddType (new AliasGen ("off_t", "long"));
+#else
+			AddType (new LPGen ("off_t"));
+#endif
 
 			// string types
 			AddType (new ConstStringGen ("const-gchar"));