From bed960e3be462499b96ce83fa0c787b7a4d39673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Mon, 19 May 1997 15:53:27 -0700
Subject: [PATCH] types.h merged into global.h

Rev: src/backend.c:1.12
Rev: src/dynamic_buffer.h:1.3
Rev: src/efun.h:1.2
Rev: src/encode.c:1.10
Rev: src/gc.h:1.7
Rev: src/global.h:1.7
Rev: src/hashtable.h:1.3
Rev: src/las.h:1.7
Rev: src/main.c:1.22
Rev: src/mapping.c:1.19
Rev: src/memory.h:1.4
Rev: src/module.h:1.3
Rev: src/modules/Gdbm/gdbmmod.c:1.3
Rev: src/modules/Gmp/mpz_glue.c:1.18
Rev: src/modules/Gz/zlibmod.c:1.8
Rev: src/modules/Image/blit.c:1.9
Rev: src/modules/Image/colortable.c:1.2
Rev: src/modules/Image/dct.c:1.7
Rev: src/modules/Image/font.c:1.10
Rev: src/modules/Image/image.c:1.28
Rev: src/modules/Image/matrix.c:1.5
Rev: src/modules/Image/operator.c:1.7
Rev: src/modules/Image/pattern.c:1.4
Rev: src/modules/Image/pnm.c:1.4
Rev: src/modules/Image/polyfill.c:1.3
Rev: src/modules/Image/quant.c:1.8
Rev: src/modules/Image/togif.c:1.11
Rev: src/modules/Image/x.c:1.9
Rev: src/modules/MIME/mime.c:1.9
Rev: src/modules/Pipe/pipe.c:1.8
Rev: src/modules/Regexp/glue.c:1.6
Rev: src/modules/Ssleay/ssleay.c:1.5
Rev: src/modules/Yp/yp.c:1.7
Rev: src/modules/files/efuns.c:1.23
Rev: src/modules/files/file.c:1.39
Rev: src/modules/files/socket.c:1.11
Rev: src/modules/readline/readlinemod.c:1.3
Rev: src/modules/spider/accesseddb.c:1.9
Rev: src/modules/spider/discdate.c:1.5
Rev: src/modules/spider/dumudp.c:1.10
Rev: src/modules/spider/spider.c:1.33
Rev: src/modules/spider/stardate.c:1.5
Rev: src/modules/spider/streamed_parser.c:1.6
Rev: src/multiset.c:1.5
Rev: src/object.h:1.10
Rev: src/peep.c:1.11
Rev: src/port.h:1.17
Rev: src/program.h:1.15
Rev: src/rusage.c:1.5
Rev: src/stralloc.h:1.8
Rev: src/stuff.h:1.2
Rev: src/svalue.h:1.8
Rev: src/types.h:1.5(DEAD)
---
 src/backend.c                        |  3 +-
 src/dynamic_buffer.h                 |  2 --
 src/efun.h                           |  2 --
 src/encode.c                         |  1 -
 src/gc.h                             |  3 +-
 src/global.h                         | 36 ++++++++++++++++++++++
 src/hashtable.h                      |  2 +-
 src/las.h                            |  1 -
 src/main.c                           |  3 +-
 src/mapping.c                        |  3 +-
 src/memory.h                         |  2 +-
 src/module.h                         |  2 --
 src/modules/Gdbm/gdbmmod.c           |  3 +-
 src/modules/Gmp/mpz_glue.c           |  3 +-
 src/modules/Gz/zlibmod.c             |  3 +-
 src/modules/Image/blit.c             |  3 +-
 src/modules/Image/colortable.c       |  3 +-
 src/modules/Image/dct.c              |  3 +-
 src/modules/Image/font.c             |  3 +-
 src/modules/Image/image.c            |  5 ++--
 src/modules/Image/matrix.c           |  3 +-
 src/modules/Image/operator.c         |  3 +-
 src/modules/Image/pattern.c          |  3 +-
 src/modules/Image/pnm.c              |  3 +-
 src/modules/Image/polyfill.c         |  1 -
 src/modules/Image/quant.c            |  3 +-
 src/modules/Image/togif.c            |  3 +-
 src/modules/Image/x.c                |  5 ++--
 src/modules/MIME/mime.c              |  5 ++--
 src/modules/Pipe/pipe.c              |  3 +-
 src/modules/Regexp/glue.c            |  1 -
 src/modules/Ssleay/ssleay.c          |  3 +-
 src/modules/Yp/yp.c                  |  1 -
 src/modules/files/efuns.c            |  1 -
 src/modules/files/file.c             |  3 +-
 src/modules/files/socket.c           |  1 -
 src/modules/readline/readlinemod.c   |  1 -
 src/modules/spider/accesseddb.c      |  1 -
 src/modules/spider/discdate.c        |  1 -
 src/modules/spider/dumudp.c          |  3 +-
 src/modules/spider/spider.c          |  1 -
 src/modules/spider/stardate.c        |  1 -
 src/modules/spider/streamed_parser.c |  1 -
 src/multiset.c                       |  1 -
 src/object.h                         |  2 +-
 src/peep.c                           |  1 -
 src/port.h                           |  2 +-
 src/program.h                        |  1 -
 src/rusage.c                         |  1 -
 src/stralloc.h                       |  2 +-
 src/stuff.h                          |  2 +-
 src/svalue.h                         |  2 +-
 src/types.h                          | 45 ----------------------------
 53 files changed, 70 insertions(+), 126 deletions(-)
 delete mode 100644 src/types.h

diff --git a/src/backend.c b/src/backend.c
index 6c4bf106f5..c2cee4a597 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -4,7 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: backend.c,v 1.11 1997/05/19 09:28:41 hubbe Exp $");
+RCSID("$Id: backend.c,v 1.12 1997/05/19 22:48:05 hubbe Exp $");
 #include "backend.h"
 #include <errno.h>
 #ifdef HAVE_SYS_TYPES_H
@@ -14,7 +14,6 @@ RCSID("$Id: backend.c,v 1.11 1997/05/19 09:28:41 hubbe Exp $");
 #include <string.h>
 #include "interpret.h"
 #include "object.h"
-#include "types.h"
 #include "error.h"
 #include "fd_control.h"
 #include "main.h"
diff --git a/src/dynamic_buffer.h b/src/dynamic_buffer.h
index 50d6fce474..2858274a0a 100644
--- a/src/dynamic_buffer.h
+++ b/src/dynamic_buffer.h
@@ -8,8 +8,6 @@
 
 #define BUFFER_BEGIN_SIZE 4080
 
-#include "types.h"
-
 struct string_s
 {
   char *str;
diff --git a/src/efun.h b/src/efun.h
index f7e0c60b39..368a3a688e 100644
--- a/src/efun.h
+++ b/src/efun.h
@@ -6,8 +6,6 @@
 #ifndef EFUN_H
 #define EFUN_H
 
-#include "types.h"
-
 typdef void (*efun_t) (INT32);
 
 /* I need:
diff --git a/src/encode.c b/src/encode.c
index 300436c193..12e9c3127d 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -5,7 +5,6 @@
 \*/
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/gc.h b/src/gc.h
index 8bf24ac20e..74876eec46 100644
--- a/src/gc.h
+++ b/src/gc.h
@@ -3,8 +3,7 @@
 
 #ifdef GC2
 
-#include "types.h"
-#include "callback.h"
+#include "global.h"
 
 extern INT32 num_objects;
 extern INT32 num_allocs;
diff --git a/src/global.h b/src/global.h
index 2a14b28e79..21585e30df 100644
--- a/src/global.h
+++ b/src/global.h
@@ -107,6 +107,42 @@ char *alloca ();
 #define INLINE
 #endif
 
+/* we here define a few types with more defined values */
+
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#undef HAVE_LIMITS_H
+#endif
+
+#define INT64 long long
+
+#if SIZEOF_SHORT >= 4
+#define INT32 short
+#else
+#if SIZEOF_INT >= 4
+#define INT32 int
+#else
+#define INT32 long
+#endif
+#endif
+
+#define INT16 short
+#define INT8 char
+
+#define SIZE_T unsigned INT32
+
+#define TYPE_T unsigned INT8
+#define TYPE_FIELD unsigned INT16
+
+#define FLOAT_TYPE float
+
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#undef HAVE_SYS_TYPES_H
+#endif
+
+
 #include "port.h"
 
 
diff --git a/src/hashtable.h b/src/hashtable.h
index c5271c188e..3d2ad14188 100644
--- a/src/hashtable.h
+++ b/src/hashtable.h
@@ -6,7 +6,7 @@
 #ifndef HASHTABLE_H
 #define HASHTABLE_H
 
-#include "types.h"
+#include "global.h"
 
 #define AVERAGE_HASH_LENGTH 16
 #define NEW_HASHTABLE_SIZE 4
diff --git a/src/las.h b/src/las.h
index 0786704747..b92cc7b2ed 100644
--- a/src/las.h
+++ b/src/las.h
@@ -7,7 +7,6 @@
 #define LAS_H
 
 #include "global.h"
-#include "types.h"
 #include "svalue.h"
 #include "dynamic_buffer.h"
 #include "program.h"
diff --git a/src/main.c b/src/main.c
index c780f60a94..8379bf57e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -4,8 +4,7 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: main.c,v 1.21 1997/04/16 03:09:13 hubbe Exp $");
-#include "types.h"
+RCSID("$Id: main.c,v 1.22 1997/05/19 22:48:07 hubbe Exp $");
 #include "backend.h"
 #include "module.h"
 #include "object.h"
diff --git a/src/mapping.c b/src/mapping.c
index 82a95a0f3f..4e23c21d60 100644
--- a/src/mapping.c
+++ b/src/mapping.c
@@ -4,9 +4,8 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mapping.c,v 1.18 1997/04/23 23:06:16 hubbe Exp $");
+RCSID("$Id: mapping.c,v 1.19 1997/05/19 22:48:08 hubbe Exp $");
 #include "main.h"
-#include "types.h"
 #include "object.h"
 #include "mapping.h"
 #include "svalue.h"
diff --git a/src/memory.h b/src/memory.h
index 67bd340335..e53a9fe6ef 100644
--- a/src/memory.h
+++ b/src/memory.h
@@ -6,7 +6,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "types.h"
+#include "global.h"
 
 #define MEMSEARCH_LINKS 512
 
diff --git a/src/module.h b/src/module.h
index 85c5d5a216..006fd2b5aa 100644
--- a/src/module.h
+++ b/src/module.h
@@ -6,8 +6,6 @@
 #ifndef MODULE_H
 #define MODULE_H
 
-#include "types.h"
-
 /* Prototypes begin here */
 struct static_module;
 void init_modules(void);
diff --git a/src/modules/Gdbm/gdbmmod.c b/src/modules/Gdbm/gdbmmod.c
index 1f269fbb49..7a5e2a7a80 100644
--- a/src/modules/Gdbm/gdbmmod.c
+++ b/src/modules/Gdbm/gdbmmod.c
@@ -4,9 +4,8 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: gdbmmod.c,v 1.2 1997/03/17 03:06:36 hubbe Exp $");
+RCSID("$Id: gdbmmod.c,v 1.3 1997/05/19 22:48:34 hubbe Exp $");
 #include "gdbm_machine.h"
-#include "types.h"
 #include "threads.h"
 
 /* Todo: make sure only one thread accesses the same gdbmmod */
diff --git a/src/modules/Gmp/mpz_glue.c b/src/modules/Gmp/mpz_glue.c
index e28c580b31..1ed2123be9 100644
--- a/src/modules/Gmp/mpz_glue.c
+++ b/src/modules/Gmp/mpz_glue.c
@@ -4,9 +4,8 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: mpz_glue.c,v 1.17 1997/05/15 17:36:01 grubba Exp $");
+RCSID("$Id: mpz_glue.c,v 1.18 1997/05/19 22:48:54 hubbe Exp $");
 #include "gmp_machine.h"
-#include "types.h"
 
 #if !defined(HAVE_LIBGMP)
 #undef HAVE_GMP_H
diff --git a/src/modules/Gz/zlibmod.c b/src/modules/Gz/zlibmod.c
index 5a9551f0b5..723afe9f55 100644
--- a/src/modules/Gz/zlibmod.c
+++ b/src/modules/Gz/zlibmod.c
@@ -4,10 +4,9 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-RCSID("$Id: zlibmod.c,v 1.7 1997/04/07 03:26:31 hubbe Exp $");
+RCSID("$Id: zlibmod.c,v 1.8 1997/05/19 22:49:09 hubbe Exp $");
 
 #include "zlib_machine.h"
-#include "types.h"
 
 #if !defined(HAVE_LIBZ) && !defined(HAVE_LIBGZ)
 #undef HAVE_ZLIB_H
diff --git a/src/modules/Image/blit.c b/src/modules/Image/blit.c
index 52726e222b..0fb1976871 100644
--- a/src/modules/Image/blit.c
+++ b/src/modules/Image/blit.c
@@ -1,4 +1,4 @@
-/* $Id: blit.c,v 1.8 1997/04/18 06:47:18 mirar Exp $ */
+/* $Id: blit.c,v 1.9 1997/05/19 22:50:24 hubbe Exp $ */
 #include "global.h"
 
 /*
@@ -11,7 +11,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/colortable.c b/src/modules/Image/colortable.c
index 89bdf2a924..c6a5294d1b 100644
--- a/src/modules/Image/colortable.c
+++ b/src/modules/Image/colortable.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-/* $Id: colortable.c,v 1.1 1997/05/01 12:38:41 mirar Exp $ */
+/* $Id: colortable.c,v 1.2 1997/05/19 22:50:24 hubbe Exp $ */
 
 /*
 **! module Image
@@ -24,7 +24,6 @@
 #include "config.h"
 
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/dct.c b/src/modules/Image/dct.c
index a7bab6da10..9cd2cd5f1c 100644
--- a/src/modules/Image/dct.c
+++ b/src/modules/Image/dct.c
@@ -1,4 +1,4 @@
-/* $Id: dct.c,v 1.6 1997/04/30 01:45:57 mirar Exp $ */
+/* $Id: dct.c,v 1.7 1997/05/19 22:50:24 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,7 +12,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/font.c b/src/modules/Image/font.c
index 0f13ee4b23..7cd3de2af7 100644
--- a/src/modules/Image/font.c
+++ b/src/modules/Image/font.c
@@ -39,7 +39,7 @@
 **! see also: Image, Image.image
 */
 
-/* $Id: font.c,v 1.9 1997/04/19 12:33:47 mirar Exp $ */
+/* $Id: font.c,v 1.10 1997/05/19 22:50:25 hubbe Exp $ */
 
 #include "global.h"
 
@@ -60,7 +60,6 @@
 #include "config.h"
 
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/image.c b/src/modules/Image/image.c
index de5284943f..61ad68553c 100644
--- a/src/modules/Image/image.c
+++ b/src/modules/Image/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.27 1997/05/14 00:40:57 per Exp $ */
+/* $Id: image.c,v 1.28 1997/05/19 22:50:25 hubbe Exp $ */
 
 /*
 **! module Image
@@ -100,8 +100,7 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: image.c,v 1.27 1997/05/14 00:40:57 per Exp $");
-#include "types.h"
+RCSID("$Id: image.c,v 1.28 1997/05/19 22:50:25 hubbe Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/matrix.c b/src/modules/Image/matrix.c
index 75ac84808c..338e289928 100644
--- a/src/modules/Image/matrix.c
+++ b/src/modules/Image/matrix.c
@@ -1,4 +1,4 @@
-/* $Id: matrix.c,v 1.4 1997/04/03 07:00:26 mirar Exp $ */
+/* $Id: matrix.c,v 1.5 1997/05/19 22:50:26 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,7 +12,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/operator.c b/src/modules/Image/operator.c
index 378aae7250..0b7f1f59e8 100644
--- a/src/modules/Image/operator.c
+++ b/src/modules/Image/operator.c
@@ -1,4 +1,4 @@
-/* $Id: operator.c,v 1.6 1997/05/01 13:29:48 mirar Exp $ */
+/* $Id: operator.c,v 1.7 1997/05/19 22:50:26 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,7 +12,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/pattern.c b/src/modules/Image/pattern.c
index 26c05921ce..2dd80e8624 100644
--- a/src/modules/Image/pattern.c
+++ b/src/modules/Image/pattern.c
@@ -1,4 +1,4 @@
-/* $Id: pattern.c,v 1.3 1997/03/17 03:08:01 hubbe Exp $ */
+/* $Id: pattern.c,v 1.4 1997/05/19 22:50:26 hubbe Exp $ */
 
 #include "global.h"
 
@@ -7,7 +7,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/pnm.c b/src/modules/Image/pnm.c
index c837bccae2..9ed34a94ce 100644
--- a/src/modules/Image/pnm.c
+++ b/src/modules/Image/pnm.c
@@ -1,4 +1,4 @@
-/* $Id: pnm.c,v 1.3 1997/04/03 07:00:37 mirar Exp $ */
+/* $Id: pnm.c,v 1.4 1997/05/19 22:50:27 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,7 +12,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/polyfill.c b/src/modules/Image/polyfill.c
index 6a10e3c424..5dbdc3c414 100644
--- a/src/modules/Image/polyfill.c
+++ b/src/modules/Image/polyfill.c
@@ -6,7 +6,6 @@
 #include "config.h"
 
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/quant.c b/src/modules/Image/quant.c
index 2067fccddc..182dd345e2 100644
--- a/src/modules/Image/quant.c
+++ b/src/modules/Image/quant.c
@@ -1,5 +1,5 @@
 #include <config.h>
-/* $Id: quant.c,v 1.7 1997/03/18 16:15:24 mirar Exp $ */
+/* $Id: quant.c,v 1.8 1997/05/19 22:50:27 hubbe Exp $ */
 
 /*
 
@@ -19,7 +19,6 @@ David K
 #include <stdlib.h>
 #endif
 
-#include "types.h"
 #include "error.h"
 #include "global.h"
 #include "array.h"
diff --git a/src/modules/Image/togif.c b/src/modules/Image/togif.c
index 4b31aeb626..ed87496b76 100644
--- a/src/modules/Image/togif.c
+++ b/src/modules/Image/togif.c
@@ -4,7 +4,7 @@ togif
 
 Pontus Hagland, law@infovav.se
 
-$Id: togif.c,v 1.10 1997/05/07 23:07:14 per Exp $ 
+$Id: togif.c,v 1.11 1997/05/19 22:50:28 hubbe Exp $ 
 
 */
 
@@ -21,7 +21,6 @@ $Id: togif.c,v 1.10 1997/05/07 23:07:14 per Exp $
 #include "stralloc.h"
 #include "global.h"
 #include "threads.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Image/x.c b/src/modules/Image/x.c
index 2df655b808..2467c0019f 100644
--- a/src/modules/Image/x.c
+++ b/src/modules/Image/x.c
@@ -1,4 +1,4 @@
-/* $Id: x.c,v 1.8 1997/05/07 23:07:16 per Exp $ */
+/* $Id: x.c,v 1.9 1997/05/19 22:50:28 hubbe Exp $ */
 
 /*
 **! module Image
@@ -12,8 +12,7 @@
 
 #include "stralloc.h"
 #include "global.h"
-RCSID("$Id: x.c,v 1.8 1997/05/07 23:07:16 per Exp $");
-#include "types.h"
+RCSID("$Id: x.c,v 1.9 1997/05/19 22:50:28 hubbe Exp $");
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/MIME/mime.c b/src/modules/MIME/mime.c
index 433827a94c..449cf116c5 100644
--- a/src/modules/MIME/mime.c
+++ b/src/modules/MIME/mime.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mime.c,v 1.8 1997/05/05 22:33:54 marcus Exp $
+ * $Id: mime.c,v 1.9 1997/05/19 22:51:08 hubbe Exp $
  *
  * RFC1521 functionality for Pike
  *
@@ -9,9 +9,8 @@
 #include "config.h"
 
 #include "global.h"
-RCSID("$Id: mime.c,v 1.8 1997/05/05 22:33:54 marcus Exp $");
+RCSID("$Id: mime.c,v 1.9 1997/05/19 22:51:08 hubbe Exp $");
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "program.h"
diff --git a/src/modules/Pipe/pipe.c b/src/modules/Pipe/pipe.c
index 9de668125d..149bb51a9a 100644
--- a/src/modules/Pipe/pipe.c
+++ b/src/modules/Pipe/pipe.c
@@ -20,10 +20,9 @@
 #include <fcntl.h>
 
 #include "global.h"
-RCSID("$Id: pipe.c,v 1.7 1997/05/07 23:07:17 per Exp $");
+RCSID("$Id: pipe.c,v 1.8 1997/05/19 22:51:33 hubbe Exp $");
 
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/Regexp/glue.c b/src/modules/Regexp/glue.c
index acc7b881d4..b1ecb995d0 100644
--- a/src/modules/Regexp/glue.c
+++ b/src/modules/Regexp/glue.c
@@ -9,7 +9,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #include "global.h"
-#include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/Ssleay/ssleay.c b/src/modules/Ssleay/ssleay.c
index 39e3c5b7a6..4905f856db 100644
--- a/src/modules/Ssleay/ssleay.c
+++ b/src/modules/Ssleay/ssleay.c
@@ -7,8 +7,7 @@
 #include "config.h"
 
 #include "global.h"
-RCSID("$Id: ssleay.c,v 1.4 1997/03/17 03:10:48 hubbe Exp $");
-#include "types.h"
+RCSID("$Id: ssleay.c,v 1.5 1997/05/19 22:52:03 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/Yp/yp.c b/src/modules/Yp/yp.c
index 3e2a46bed8..163afc9212 100644
--- a/src/modules/Yp/yp.c
+++ b/src/modules/Yp/yp.c
@@ -19,7 +19,6 @@
 #include "stralloc.h"
 #include "error.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/files/efuns.c b/src/modules/files/efuns.c
index a0b34014d3..53cb135039 100644
--- a/src/modules/files/efuns.c
+++ b/src/modules/files/efuns.c
@@ -4,7 +4,6 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-#include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/files/file.c b/src/modules/files/file.c
index aa3d9881b5..b3895cfdb8 100644
--- a/src/modules/files/file.c
+++ b/src/modules/files/file.c
@@ -6,8 +6,7 @@
 #define READ_BUFFER 8192
 
 #include "global.h"
-RCSID("$Id: file.c,v 1.38 1997/05/19 09:42:29 hubbe Exp $");
-#include "types.h"
+RCSID("$Id: file.c,v 1.39 1997/05/19 22:52:39 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/files/socket.c b/src/modules/files/socket.c
index a5b51be6e7..77fc68de74 100644
--- a/src/modules/files/socket.c
+++ b/src/modules/files/socket.c
@@ -4,7 +4,6 @@
 ||| See the files COPYING and DISCLAIMER for more information.
 \*/
 #include "global.h"
-#include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/readline/readlinemod.c b/src/modules/readline/readlinemod.c
index 6aa2001375..d77e7d8819 100644
--- a/src/modules/readline/readlinemod.c
+++ b/src/modules/readline/readlinemod.c
@@ -5,7 +5,6 @@
 \*/
 #include "global.h"
 #include "readline_machine.h"
-#include "types.h"
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/spider/accesseddb.c b/src/modules/spider/accesseddb.c
index 78a9ffb50a..2b081f63f6 100644
--- a/src/modules/spider/accesseddb.c
+++ b/src/modules/spider/accesseddb.c
@@ -2,7 +2,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "backend.h"
 #include "object.h"
diff --git a/src/modules/spider/discdate.c b/src/modules/spider/discdate.c
index 545d36adea..022c757033 100644
--- a/src/modules/spider/discdate.c
+++ b/src/modules/spider/discdate.c
@@ -10,7 +10,6 @@
 
 #include "global.h"
 #include "stralloc.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
index 4a584986ce..7e1a70ef7a 100644
--- a/src/modules/spider/dumudp.c
+++ b/src/modules/spider/dumudp.c
@@ -1,8 +1,7 @@
 #include <config.h>
 
 #include "global.h"
-RCSID("$Id: dumudp.c,v 1.9 1997/04/21 19:29:50 grubba Exp $");
-#include "types.h"
+RCSID("$Id: dumudp.c,v 1.10 1997/05/19 22:53:26 hubbe Exp $");
 #include "interpret.h"
 #include "svalue.h"
 #include "stralloc.h"
diff --git a/src/modules/spider/spider.c b/src/modules/spider/spider.c
index 91995f7dcc..bfe3cd7dd8 100644
--- a/src/modules/spider/spider.c
+++ b/src/modules/spider/spider.c
@@ -24,7 +24,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "machine.h"
 #include "object.h"
diff --git a/src/modules/spider/stardate.c b/src/modules/spider/stardate.c
index 60546b4d2f..64fdff266c 100644
--- a/src/modules/spider/stardate.c
+++ b/src/modules/spider/stardate.c
@@ -2,7 +2,6 @@
 
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/modules/spider/streamed_parser.c b/src/modules/spider/streamed_parser.c
index 5af6673d5b..1f7bc06854 100644
--- a/src/modules/spider/streamed_parser.c
+++ b/src/modules/spider/streamed_parser.c
@@ -1,6 +1,5 @@
 #include "stralloc.h"
 #include "global.h"
-#include "types.h"
 #include "pike_macros.h"
 #include "object.h"
 #include "constants.h"
diff --git a/src/multiset.c b/src/multiset.c
index 806ad63283..c7a8f6dd60 100644
--- a/src/multiset.c
+++ b/src/multiset.c
@@ -5,7 +5,6 @@
 \*/
 #include "global.h"
 #include "array.h"
-#include "types.h"
 #include "multiset.h"
 #include "svalue.h"
 #include "pike_macros.h"
diff --git a/src/object.h b/src/object.h
index 28f4d91878..7cff78322e 100644
--- a/src/object.h
+++ b/src/object.h
@@ -6,7 +6,7 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include "types.h"
+#include "global.h"
 #include "svalue.h"
 
 /* a destructed object has no program */
diff --git a/src/peep.c b/src/peep.c
index 49e19ea939..1552fe2dc6 100644
--- a/src/peep.c
+++ b/src/peep.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "types.h"
 #include "language.h"
 #include "stralloc.h"
 #include "dynamic_buffer.h"
diff --git a/src/port.h b/src/port.h
index 9a1eff5b71..a6f2f3ff70 100644
--- a/src/port.h
+++ b/src/port.h
@@ -6,7 +6,7 @@
 #ifndef PORT_H
 #define PORT_H
 
-#include "types.h"
+#include "global.h"
 
 #ifndef STRUCT_TIMEVAL_DECLARED
 #define STRUCT_TIMEVAL_DECLARED
diff --git a/src/program.h b/src/program.h
index 900c03156d..6e2b42c41c 100644
--- a/src/program.h
+++ b/src/program.h
@@ -8,7 +8,6 @@
 
 #include <stdarg.h>
 #include "global.h"
-#include "types.h"
 
 #define LFUN___INIT 0
 #define LFUN_CREATE 1
diff --git a/src/rusage.c b/src/rusage.c
index c50771e76b..83d90ba55e 100644
--- a/src/rusage.c
+++ b/src/rusage.c
@@ -11,7 +11,6 @@
 #include "time_stuff.h"
 #include <fcntl.h>
 #include <errno.h>
-#include "types.h"
 #include "rusage.h"
 
 #ifdef HAVE_SYS_TIMES_H
diff --git a/src/stralloc.h b/src/stralloc.h
index aeb3b12cf5..80ef15d45b 100644
--- a/src/stralloc.h
+++ b/src/stralloc.h
@@ -5,7 +5,7 @@
 \*/
 #ifndef STRALLOC_H
 #define STRALLOC_H
-#include "types.h"
+#include "global.h"
 
 #define STRINGS_ARE_SHARED
 
diff --git a/src/stuff.h b/src/stuff.h
index fc0fe0dd89..ffded4a18c 100644
--- a/src/stuff.h
+++ b/src/stuff.h
@@ -6,7 +6,7 @@
 #ifndef STUFF_H
 #define STUFF_H
 
-#include "types.h"
+#include "global.h"
 
 /* Prototypes begin here */
 int my_log2(unsigned INT32 x);
diff --git a/src/svalue.h b/src/svalue.h
index 965388fffd..3001f4b165 100644
--- a/src/svalue.h
+++ b/src/svalue.h
@@ -6,7 +6,7 @@
 #ifndef SVALUE_H
 #define SVALUE_H
 
-#include "types.h"
+#include "global.h"
 
 #ifndef STRUCT_ARRAY_DECLARED
 #define STRUCT_ARRAY_DECLARED
diff --git a/src/types.h b/src/types.h
deleted file mode 100644
index 66d7cb537e..0000000000
--- a/src/types.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*\
-||| This file a part of Pike, and is copyright by Fredrik Hubinette
-||| Pike is distributed as GPL (General Public License)
-||| See the files COPYING and DISCLAIMER for more information.
-\*/
-#ifndef TYPES_H
-#define TYPES_H
-
-#include "machine.h"
-/* we here define a few types with more defined values */
-
-#ifdef HAVE_LIMITS_H
-#include <limits.h>
-#undef HAVE_LIMITS_H
-#endif
-
-#define INT64 long long
-
-#if SIZEOF_SHORT >= 4
-#define INT32 short
-#else
-#if SIZEOF_INT >= 4
-#define INT32 int
-#else
-#define INT32 long
-#endif
-#endif
-
-#define INT16 short
-#define INT8 char
-
-#define SIZE_T unsigned INT32
-
-#define TYPE_T unsigned INT8
-#define TYPE_FIELD unsigned INT16
-
-#define FLOAT_TYPE float
-
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#undef HAVE_SYS_TYPES_H
-#endif
-
-#endif
-- 
GitLab