X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=interpreters%2Fnitfol%2Fnitfol.h;h=3c2cd6c659c70d1cfb48a8671c3893ce3bef61ab;hb=7ef4ef1fecab7ae0f724e59f7de1315a96822152;hp=7aa50ed1c63c0b64030235be23b4a144d2cb3255;hpb=0b85f1dd5993e2ed111ec2ba13bbbb4ebda06ada;p=rodin%2Fchimara.git

diff --git a/interpreters/nitfol/nitfol.h b/interpreters/nitfol/nitfol.h
index 7aa50ed..3c2cd6c 100644
--- a/interpreters/nitfol/nitfol.h
+++ b/interpreters/nitfol/nitfol.h
@@ -23,37 +23,19 @@
 #include <stdlib.h>      /* For NULL, rand, srand */
 #include <time.h>        /* For time() */
 #include <ctype.h>       /* for isspace, isgraph, etc. */
-#include <limits.h>
-#include <libchimara/glk.h>
+#include "glk.h"
 #define GLK_EOF ((glsi32) -1)
 
 #define NITFOL_MAJOR 0
 #define NITFOL_MINOR 5
 
 /* Change these next few typedefs depending on your compiler */
-#if UCHAR_MAX==0xff
-typedef unsigned char zbyte;
-#else
-#error "Can't find an 8-bit integer type"
-#endif
+#include <stdint.h>
+typedef uint8_t zbyte;
 
 #ifdef FAST_SHORT
-
-#if SHRT_MAX==0x7fff
-typedef unsigned short zword;
-#elif INT_MAX==0x7fff
-typedef unsigned int zword;
-#else
-#error "Can't find a 16-bit integer type"
-#endif
-
-#if INT_MAX==0x7fffffff
-typedef unsigned int offset;
-#elif LONG_MAX==0x7fffffff
-typedef unsigned long offset;
-#else
-#error "Can't find a 32-bit integer type"
-#endif
+typedef uint16_t zword;
+typedef uint32_t offset;
 
 #ifdef TWOS16SHORT
 #define FAST_TWOS16SHORT
@@ -62,28 +44,11 @@ typedef unsigned long offset;
 #else
 
 #ifdef FAST_SIGNED
-#if INT_MAX==0x7fffffff
-typedef int zword;
-typedef int offset;
-#elif LONG_MAX==0x7fffffff
-typedef long zword;
-typedef long offset;
+typedef int32_t zword;
+typedef int32_t offset;
 #else
-#error "Can't find a 32-bit integer type"
-#endif
-
-#else
-
-#if INT_MAX==0x7fffffff
-typedef unsigned int zword;
-typedef unsigned int offset;
-#elif LONG_MAX==0x7fffffff
-typedef unsigned long zword;
-typedef unsigned long offset;
-#else
-#error "Can't find a 32-bit integer type"
-#endif
-
+typedef uint32_t zword;  /* Needs to be >= real zword */
+typedef uint32_t offset;
 #endif
 
 #endif
@@ -324,11 +289,11 @@ typedef enum { OBJ_GET_INFO, OBJ_RECEIVE, OBJ_MOVE } watchinfo;
 #include "decode.h"
 #include "main.h"
 
-#include "nio.h"
+#include "io.h"
 #include "z_io.h"
 
 #include "no_snd.h"
-#include <libchimara/gi_blorb.h>
+#include "gi_blorb.h"
 #include "no_graph.h"
 #include "no_blorb.h"