[BACK]Return to compiler.h CVS log [TXT] [DIR] Up to [RetroPC.NET] / np2 / x11

Diff for /np2/x11/compiler.h between versions 1.6 and 1.13

version 1.6, 2003/11/30 16:18:08 version 1.13, 2004/02/06 16:51:21
Line 38 Line 38
 #include <sys/param.h>  #include <sys/param.h>
 #include <sys/time.h>  #include <sys/time.h>
 #include <assert.h>  #include <assert.h>
   #include <errno.h>
 #include <fcntl.h>  #include <fcntl.h>
   #include <setjmp.h>
 #include <stdio.h>  #include <stdio.h>
 #include <stdlib.h>  #include <stdlib.h>
 #include <stdarg.h>  #include <stdarg.h>
Line 50 Line 52
 #define OSLANG_EUC  #define OSLANG_EUC
 #define OSLINEBREAK_LF  #define OSLINEBREAK_LF
   
 typedef signed char     CHAR;  typedef signed char             CHAR;
 typedef signed short    SHORT;  typedef signed short            SHORT;
 typedef signed int      INT;  typedef signed int              INT;
 typedef signed long     LONG;  typedef signed long             LONG;
   
 typedef unsigned char   UCHAR;  typedef unsigned char           UCHAR;
 typedef unsigned short  USHORT;  typedef unsigned short          USHORT;
 typedef unsigned int    UINT;  typedef unsigned int            UINT;
 typedef unsigned long   ULONG;  typedef unsigned long           ULONG;
   
 typedef signed char     SINT8;  typedef signed char             SINT8;
 typedef signed short    SINT16;  typedef signed short            SINT16;
 typedef signed int      SINT32;  typedef signed int              SINT32;
   typedef signed long long        SINT64;
 typedef unsigned char   UINT8;  
 typedef unsigned short  UINT16;  typedef unsigned char           UINT8;
 typedef unsigned int    UINT32;  typedef unsigned short          UINT16;
   typedef unsigned int            UINT32;
   typedef unsigned long long      UINT64;
   
   typedef unsigned char           BYTE;
   typedef unsigned short          WORD;
   typedef unsigned int            DWORD;
   
 typedef unsigned char   BYTE;  typedef unsigned char           TCHAR;
 typedef unsigned char   TCHAR;  
   
 typedef int             BOOL;  typedef int                     BOOL;
   
 #include "common.h"  
 #include "milstr.h"  
 #include "_memory.h"  
 #include "rect.h"  
 #include "lstarray.h"  
 #include "trace.h"  
   
 #ifndef TRUE  #ifndef TRUE
 #define TRUE    1  #define TRUE    1
Line 113  typedef int  BOOL; Line 113  typedef int  BOOL;
 #define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))  #define roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
 #endif  #endif
   
   #ifndef UNUSED
 #define UNUSED(v)       ((void)(v))  #define UNUSED(v)       ((void)(v))
 #define INLINE          __inline  #endif
   
   #define FASTCALL
 #define SOUNDCALL  #define SOUNDCALL
   #define MEMCALL
   #define CPUCALL
   
 #ifdef  DEBUG  #ifdef  DEBUG
   #define INLINE
 #define __ASSERT(s)     assert(s)  #define __ASSERT(s)     assert(s)
 #else  #else
   #ifndef __ASSERT
 #define __ASSERT(s)  #define __ASSERT(s)
 #endif  #endif
   #ifndef INLINE
   #define INLINE          __inline
   #endif
   #endif
   
 #ifndef NELEMENTS  #ifndef NELEMENTS
 #define NELEMENTS(a)    ((int)(sizeof(a) / sizeof(a[0])))  #define NELEMENTS(a)    ((int)(sizeof(a) / sizeof(a[0])))
Line 132  UINT32 gettick(); Line 143  UINT32 gettick();
 #define GETRAND()       random()  #define GETRAND()       random()
 #define SPRINTF         sprintf  #define SPRINTF         sprintf
   
   #if defined(CPUCORE_IA32)
   void toolkit_msgbox(const char *title, const char *msg);
   #define msgbox(title, msg)      toolkit_msgbox(title, msg);
   #endif
   
 #if defined(i386) || defined(__i386__)  #if defined(i386) || defined(__i386__)
 #undef  MEMOPTIMIZE  #undef  MEMOPTIMIZE
   #define LOADINTELDWORD(a)       (*((UINT32 *)(a)))
   #define LOADINTELWORD(a)        (*((UINT16 *)(a)))
   #define STOREINTELDWORD(a, b)   *(UINT32 *)(a) = (b)
   #define STOREINTELWORD(a, b)    *(UINT16 *)(a) = (b)
 #elif defined(arm) || defined (__arm__)  #elif defined(arm) || defined (__arm__)
 #define MEMOPTIMIZE     2  #define MEMOPTIMIZE     2
   #define REG8            UINT
   #define REG16           UINT
 #else  #else
 #define MEMOPTIMIZE     1  #define MEMOPTIMIZE     1
 #endif  #endif
   
 #define SUPPORT_EUC  #define SUPPORT_EUC
   
 #define SUPPORT_8BPP  #undef  SUPPORT_8BPP
 #define SUPPORT_24BPP  
 #define SUPPORT_16BPP  #define SUPPORT_16BPP
   #define SUPPORT_24BPP
 #define SUPPORT_32BPP  #define SUPPORT_32BPP
 #define SUPPORT_NORMALDISP  #define SUPPORT_NORMALDISP
   
 #if defined(USE_GTK)  #define SUPPORT_HOSTDRV
   
   #undef  SUPPORT_SASI
   #undef  SUPPORT_SCSI
   
   #if USE_GTK > 0
   #define SUPPORT_S98
 #define SUPPORT_KEYDISP  #define SUPPORT_KEYDISP
 #endif  #endif
   
   #if USE_SDL > 0
   #define USE_SYSMENU
   #define SCREEN_BPP      16
   #undef  SUPPORT_24BPP
   #undef  SUPPORT_32BPP
   #endif
   
 /*  /*
  * You could specify a complete path, e.g. "/etc/timidity.cfg", and   * You could specify a complete path, e.g. "/etc/timidity.cfg", and
  * then specify the library directory in the configuration file.   * then specify the library directory in the configuration file.
Line 159  UINT32 gettick(); Line 194  UINT32 gettick();
 extern char timidity_cfgfile_path[MAX_PATH];  extern char timidity_cfgfile_path[MAX_PATH];
 #define TIMIDITY_CFGFILE        timidity_cfgfile_path  #define TIMIDITY_CFGFILE        timidity_cfgfile_path
   
   #include "common.h"
   #include "milstr.h"
   #include "_memory.h"
   #include "rect.h"
   #include "lstarray.h"
   #include "trace.h"
   
 #endif  /* NP2_X11_COMPILER_H__ */  #endif  /* NP2_X11_COMPILER_H__ */
Removed from v.1.6  
changed lines
  Added in v.1.13

RetroPC.NET-CVS <cvs@retropc.net>