X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/0b1810574f85f9345450c4699411ce94569f361a..3884054be9261b4607f5f3a2d0b79695f65b851f:/mptypes.c

diff --git a/mptypes.c b/mptypes.c
index 28f44c4..f10ed7e 100644
--- a/mptypes.c
+++ b/mptypes.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mptypes.c,v 1.2 1999/11/13 01:54:32 mdw Exp $
+ * $Id: mptypes.c,v 1.4 2000/10/08 12:05:24 mdw Exp $
  *
  * Generate `mptypes.h' header file for current architecture
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mptypes.c,v $
+ * Revision 1.4  2000/10/08 12:05:24  mdw
+ * Make later versions of GCC shut up about @long long@.
+ *
+ * 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.
@@ -52,6 +58,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
@@ -62,7 +74,7 @@
   typedef uintmax_t umax;
 # define P_UMAX PRIuMAX
 #elif defined(ULLONG_MAX)
-  typedef unsigned long long umax;
+  __extension__ typedef unsigned long long umax;
 # define P_UMAX "%llu"
 #else
   typedef unsigned long umax;
@@ -75,7 +87,8 @@
  */
 
 enum {
-  f_stdint
+  f_stdint = 1u,
+  f_ext = 2u
 };
 
 struct itype {
@@ -85,14 +98,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 },
 };
@@ -105,6 +118,7 @@ int main(int argc, char *argv[])
 {
   itype *i;
   itype *largest, *mpw, *mpd;
+  const static char *extstr = "CATACOMB_MPTYPES_EXTENSION ";
 
   /* --- Find the bitcounts --- */
 
@@ -154,8 +168,8 @@ int main(int argc, char *argv[])
  * mptypes.h [generated]\n\
  */\n\
 \n\
-#ifndef MPTYPES_H\n\
-#define MPTYPES_H\n\
+#ifndef CATACOMB_MPTYPES_H\n\
+#define CATACOMB_MPTYPES_H\n\
 ");
   if ((mpd->flags | mpw->flags) & f_stdint) {
     puts("\
@@ -164,20 +178,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 -------------------------------------------------*/