X-Git-Url: https://deadsoftware.ru/gitweb?p=cpc.git;a=blobdiff_plain;f=C%2FSYSTEM.h;h=9f36508948bab41947010450ee923456e3ef8bc6;hp=f0d6a9fe0046a7ac139dccac7c8ba5c5d27614a1;hb=2f6052eb7f36254f3f459addb169dd7c07786cf7;hpb=eb117cae2600763b67692ee65f22d33efdb89fe5

diff --git a/C/SYSTEM.h b/C/SYSTEM.h
index f0d6a9f..9f36508 100644
--- a/C/SYSTEM.h
+++ b/C/SYSTEM.h
@@ -15,7 +15,7 @@ bh 20.12.1999
 #ifdef __GNUC__
 #  include <alloca.h>
 #endif
-#include <malloc.h>
+#include <stdint.h>
 #include <string.h>
 
 /* extern char *memcpy(); */
@@ -24,33 +24,59 @@ bh 20.12.1999
 #define import extern
 
 /* basic types */
+/*
 typedef unsigned char BOOLEAN;
 typedef unsigned char SHORTCHAR;
 typedef unsigned short CHAR;
 typedef signed char BYTE;
 typedef short SHORTINT;
 typedef int INTEGER;
+*/
 #if !defined(_WIN64) && ((__SIZEOF_POINTER__ == 8) || defined (_LP64) || defined(__LP64__))
-  typedef long LONGINT; /* LP64 */
-  typedef unsigned long __U_LONGINT;
+  /* typedef long LONGINT; */ /* LP64 */
+  /* typedef unsigned long __U_LONGINT; */
 #else
-  typedef long long LONGINT; /* ILP32 or LLP64 */
-  typedef unsigned long long __U_LONGINT;
+  /* typedef long long LONGINT; */ /* ILP32 or LLP64 */
+  /* typedef unsigned long long __U_LONGINT; */
 #endif
+/*
 typedef float SHORTREAL;
 typedef double REAL;
 typedef unsigned int SET;
 typedef void ANYREC;
 typedef void *ANYPTR;
 typedef void *SYSTEM_PTR;
+*/
+typedef uint8_t  BOOLEAN;
+typedef uint8_t  SHORTCHAR;
+typedef uint16_t CHAR;
+typedef int8_t   BYTE;
+typedef int16_t  SHORTINT;
+typedef int32_t  INTEGER;
+typedef int64_t  LONGINT;
+typedef float    SHORTREAL;
+typedef double   REAL;
+typedef uint32_t SET;
+typedef void     ANYREC;
+typedef void    *ANYPTR;
+typedef void    *SYSTEM_PTR;
 
 /* Unsigned variants are for use by shift and rotate macros */
+typedef uint8_t  __U_SHORTCHAR;
+typedef uint16_t __U_CHAR;
+typedef uint8_t  __U_BYTE;
+typedef uint16_t __U_SHORTINT;
+typedef uint32_t __U_INTEGER;
+typedef uint64_t __U_LONGINT;
+typedef uint32_t __U_SET;
+/*
 typedef unsigned char __U_SHORTCHAR;
 typedef unsigned short __U_CHAR;
 typedef unsigned char __U_BYTE;
 typedef unsigned short __U_SHORTINT;
 typedef unsigned int __U_INTEGER;
 typedef unsigned int __U_SET;
+*/
 
 extern LONGINT SYSTEM_INF;
 extern INTEGER SYSTEM_INFS;