be consistent about ssize_t

This commit is contained in:
berkeviktor@aol.com 2010-10-06 14:29:45 +02:00
parent b0e8ed68ba
commit 11a9adb19f
3 changed files with 26 additions and 25 deletions

View File

@ -1,13 +1,15 @@
/* #include <sys/types.h>
* Hand tailored config.h for windows.
*/
/* define ssize_t to int if <sys/types.h> doesn't define.*/ #ifndef SSIZE_T_DEFINED
typedef int ssize_t; #ifdef ssize_t
/* #undef ssize_t */ #undef ssize_t
#endif
#if defined(_MSC_VER) #ifdef _WIN64
#pragma warning(disable: 4996) /* The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name. */ typedef __int64 ssize_t;
#else
typedef _W64 int ssize_t;
#endif
#define SSIZE_T_DEFINED
#endif #endif
#define ENCHANT_VERSION_STRING "1.6.0" #define ENCHANT_VERSION_STRING "1.6.0"

11
src/fe-gtk/typedef.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef SSIZE_T_DEFINED
#ifdef ssize_t
#undef ssize_t
#endif
#ifdef _WIN64
typedef __int64 ssize_t;
#else
typedef _W64 int ssize_t;
#endif
#define SSIZE_T_DEFINED
#endif

View File

@ -1590,29 +1590,17 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/setup.c xchat-wdk/src/fe
diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c xchat-wdk/src/fe-gtk/sexy-spell-entry.c
--- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c 2006-07-17 05:51:02 +0000 --- xchat-wdk.orig/src/fe-gtk/sexy-spell-entry.c 2006-07-17 05:51:02 +0000
+++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-10-05 22:10:24 +0000 +++ xchat-wdk/src/fe-gtk/sexy-spell-entry.c 2010-10-06 12:23:23 +0000
@@ -31,6 +31,20 @@ @@ -31,6 +31,8 @@
/*#include "gtkspell-iso-codes.h" /*#include "gtkspell-iso-codes.h"
#include "sexy-marshal.h"*/ #include "sexy-marshal.h"*/
+/* workaround for ssize_t in VS +#include "typedef.h"
+ from krb/include/win-mac.h */
+#ifndef SSIZE_T_DEFINED
+#ifdef ssize_t
+#undef ssize_t
+#endif
+#ifdef _WIN64
+typedef __int64 ssize_t;
+#else
+typedef _W64 int ssize_t;
+#endif
+#define SSIZE_T_DEFINED
+#endif
+ +
/* /*
* Bunch of poop to make enchant into a runtime dependency rather than a * Bunch of poop to make enchant into a runtime dependency rather than a
* compile-time dependency. This makes it so I don't have to hear the * compile-time dependency. This makes it so I don't have to hear the
@@ -134,12 +148,10 @@ @@ -134,12 +136,10 @@
GModule *enchant; GModule *enchant;
gpointer funcptr; gpointer funcptr;