Make z_size_t unsigned long for non-standard C.

Also declare z_size_t when compiling solo.
8 years ago · 61b91f27f8
parent cca27e95cf
commit 61b91f27f8
3 changed files with 21 additions and 9 deletions
--- a/zconf.h
+++ b/zconf.h
@ -229,13 +229,17 @@
 #  define z_const
 #endif

-#ifndef Z_SOLO
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
 #  define z_longlong long long
-#  ifdef NO_SIZE_T
+#  if defined(NO_SIZE_T)
     typedef unsigned NO_SIZE_T z_size_t;
-#  else
+#  elif defined(STDC)
 #    include <stddef.h>
     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
 #  endif
 #  undef z_longlong
 #endif
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@ -231,13 +231,17 @@
 #  define z_const
 #endif

-#ifndef Z_SOLO
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
 #  define z_longlong long long
-#  ifdef NO_SIZE_T
+#  if defined(NO_SIZE_T)
     typedef unsigned NO_SIZE_T z_size_t;
-#  else
+#  elif defined(STDC)
 #    include <stddef.h>
     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
 #  endif
 #  undef z_longlong
 #endif
--- a/zconf.h.in
+++ b/zconf.h.in
@ -229,13 +229,17 @@
 #  define z_const
 #endif

-#ifndef Z_SOLO
+#ifdef Z_SOLO
+   typedef unsigned long z_size_t;
+#else
 #  define z_longlong long long
-#  ifdef NO_SIZE_T
+#  if defined(NO_SIZE_T)
     typedef unsigned NO_SIZE_T z_size_t;
-#  else
+#  elif defined(STDC)
 #    include <stddef.h>
     typedef size_t z_size_t;
+#  else
+     typedef unsigned long z_size_t;
 #  endif
 #  undef z_longlong
 #endif