X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b3f050848e5d285c2a1d7f8a4bea98984c201805..025c5f4aa5ffbf8948482a4233318db81c2df5d2:/mptypes.c

diff --git a/mptypes.c b/mptypes.c
index dcdf839..9796d5c 100644
--- a/mptypes.c
+++ b/mptypes.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mptypes.c,v 1.3 1999/12/10 23:29:48 mdw Exp $
+ * $Id$
  *
  * Generate `mptypes.h' header file for current architecture
  *
@@ -27,18 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: mptypes.c,v $
- * Revision 1.3  1999/12/10 23:29:48  mdw
- * Change header file guard names.
- *
- * Revision 1.2  1999/11/13 01:54:32  mdw
- * Format source code properly ;-).  Attach suffixes to the `max'
- * constants.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #define _GNU_SOURCE
@@ -46,6 +34,7 @@
 #include <limits.h>
 #if __STDC_VERSION__ >= 199900l
 #  include <stdint.h>
+#  include <inttypes.h>
 #endif
 
 /*----- Data types --------------------------------------------------------*/
@@ -55,6 +44,12 @@
  * WG14 in their infinite wisdom decided not to use the GCC constant name.
  */
 
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)
+#  define EXT __extension__
+#else
+#  define EXT
+#endif
+
 #if defined(ULONG_LONG_MAX) && !defined(ULLONG_MAX)
 #  define ULLONG_MAX ULONG_LONG_MAX
 #endif
@@ -65,11 +60,11 @@
   typedef uintmax_t umax;
 # define P_UMAX PRIuMAX
 #elif defined(ULLONG_MAX)
-  typedef unsigned long long umax;
-# define P_UMAX "%llu"
+  __extension__ typedef unsigned long long umax;
+# define P_UMAX "llu"
 #else
   typedef unsigned long umax;
-# define P_UMAX "%lu"
+# define P_UMAX "lu"
 #endif
 
 /* --- Table of interesting types --- *
@@ -78,7 +73,8 @@
  */
 
 enum {
-  f_stdint
+  f_stdint = 1u,
+  f_ext = 2u
 };
 
 struct itype {
@@ -88,14 +84,14 @@ struct itype {
   unsigned flags;
   unsigned bits;
 } tytab[] = {
-  { "unsigned int", "u",	UINT_MAX,	0 },
-  { "unsigned short", "u",	USHRT_MAX,	0 },
-  { "unsigned long", "ul",	ULONG_MAX,	0 },
+  { "unsigned int",		"u",	UINT_MAX,		0 },
+  { "unsigned short",		"u",	USHRT_MAX,		0 },
+  { "unsigned long",		"ul",	ULONG_MAX,		0 },
 #ifdef ULLONG_MAX
-  { "unsigned long long", "ull", ULLONG_MAX,	0 },
+  { "unsigned long long",	"ull",	EXT ULLONG_MAX,		f_ext },
 #endif
 #ifdef UINTMAX_MAX
-  { "uintmax_t", "u",		UINTMAX_MAX,	f_stdint },
+  { "uintmax_t",		"u",	UINTMAX_MAX,		f_stdint },
 #endif
   { 0,				0 },
 };
@@ -108,6 +104,7 @@ int main(int argc, char *argv[])
 {
   itype *i;
   itype *largest, *mpw, *mpd;
+  const static char *extstr = "CATACOMB_MPTYPES_EXTENSION ";
 
   /* --- Find the bitcounts --- */
 
@@ -167,20 +164,34 @@ int main(int argc, char *argv[])
 #endif\n\
 ");
   }
+  if ((mpd->flags | mpw->flags) & f_ext) {
+    printf("\
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 91)\n\
+#  define %s __extension__\n\
+#else\n\
+#  define %s\n\
+#endif\n\
+", extstr, extstr);
+  }
   printf("\
-typedef %s mpw;\n\
+%stypedef %s mpw;\n\
 #define MPW_BITS %u\n\
-#define MPW_MAX " P_UMAX "%s\n\
+#define MPW_MAX %s%" P_UMAX "%s\n\
 \n\
-typedef %s mpd;\n\
+%stypedef %s mpd;\n\
 #define MPD_BITS %u\n\
-#define MPD_MAX " P_UMAX "%s\n\
+#define MPD_MAX %s%" P_UMAX "%s\n\
 \n\
 #endif\n\
 ",
-  mpw->name, mpw->bits, mpw->max, mpw->suff,
-  mpd->name, mpd->bits, mpd->max, mpd->suff);
+  mpw->flags & f_ext ? extstr : "", mpw->name,
+  mpw->bits,
+  mpw->flags & f_ext ? extstr : "", mpw->max, mpw->suff,
+  mpd->flags & f_ext ? extstr : "", mpd->name,
+  mpd->bits,
+  mpd->flags & f_ext ? extstr : "", mpd->max, mpd->suff);
 
   return (0);
 }
+
 /*----- That's all, folks -------------------------------------------------*/