From 1c2ab15475c14cc7b4fe12809339bef89f89da9c Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 3 Mar 2013 01:03:33 +0000
Subject: [PATCH] Move */include/pstypes.h -> common/include/pstypes.h

---
 SConstruct                                |   1 +
 {d1x-rebirth => common}/include/pstypes.h |   0
 d2x-rebirth/include/pstypes.h             | 101 ----------------------
 3 files changed, 1 insertion(+), 101 deletions(-)
 rename {d1x-rebirth => common}/include/pstypes.h (100%)
 delete mode 100644 d2x-rebirth/include/pstypes.h

diff --git a/SConstruct b/SConstruct
index 0b4cb3393..0c20faa11 100644
--- a/SConstruct
+++ b/SConstruct
@@ -103,6 +103,7 @@ class DXXCommon:
 		self.env.Append(CCFLAGS = ['-Wall', '-funsigned-char', '-Werror=implicit-int', '-Werror=implicit-function-declaration', '-pedantic', '-pthread'])
 		self.env.Append(CFLAGS = ['-std=c99'])
 		self.env.Append(CPPDEFINES = ['NETWORK'])
+		self.env.Append(CPPPATH = ['common/include'])
 		# Get traditional compiler environment variables
 		for cc in ['CC', 'CXX']:
 			if os.environ.has_key(cc):
diff --git a/d1x-rebirth/include/pstypes.h b/common/include/pstypes.h
similarity index 100%
rename from d1x-rebirth/include/pstypes.h
rename to common/include/pstypes.h
diff --git a/d2x-rebirth/include/pstypes.h b/d2x-rebirth/include/pstypes.h
deleted file mode 100644
index 9989c90a0..000000000
--- a/d2x-rebirth/include/pstypes.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *
- * Common types and defines
- *
- */
-
-#ifndef _TYPES_H
-#define _TYPES_H
-
-#ifndef macintosh
-#include <sys/types.h>
-#endif
-
-#include <limits.h>
-
-// define a dboolean
-typedef int dboolean;
-
-//define a signed byte
-typedef signed char sbyte;
-
-//define unsigned types;
-typedef unsigned char ubyte;
-#if defined(_WIN32) || defined(macintosh)
-typedef unsigned short ushort;
-typedef unsigned int uint;
-#endif
-
-#if defined(_WIN32) || defined(__sun__) // platforms missing (u_)int??_t
-# include <SDL/SDL_types.h>
-#elif defined(macintosh) // misses (u_)int??_t and does not like SDL_types.h
-# include <MacTypes.h>
- typedef SInt16 int16_t;
- typedef SInt32 int32_t;
- typedef SInt64 int64_t;
- typedef UInt16 u_int16_t;
- typedef UInt32 u_int32_t;
- typedef UInt64 u_int64_t;
-#endif // macintosh
-#if defined(_WIN32) || defined(__sun__) // platforms missing u_int??_t
- typedef Uint16 u_int16_t;
- typedef Uint32 u_int32_t;
- typedef Uint64 u_int64_t;
-#endif // defined(_WIN32) || defined(__sun__)
-
-#ifdef _MSC_VER
-# include <stdlib.h> // this is where min and max are defined
-#endif
-#ifndef min
-#define min(a,b) (((a)>(b))?(b):(a))
-#endif
-#ifndef max
-#define max(a,b) (((a)<(b))?(b):(a))
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-#ifndef bool
-//define a boolean
-typedef ubyte bool;
-#endif
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-// the following stuff has nothing to do with types but needed everywhere,
-// and since this file is included everywhere, it's here.
-#if  defined(__i386__) || defined(__ia64__) || defined(_WIN32) || \
-(defined(__alpha__) || defined(__alpha)) || \
-defined(__arm__) || defined(ARM) || \
-(defined(__mips__) && defined(__MIPSEL__)) || \
-defined(__SYMBIAN32__) || \
-defined(__x86_64__) || \
-defined(__LITTLE_ENDIAN__)	// from physfs_internal.h
-//# define WORDS_BIGENDIAN 0
-#else
-# define WORDS_BIGENDIAN 1
-#endif
-
-#ifdef __GNUC__
-# define __pack__ __attribute__((packed))
-#elif defined(_MSC_VER)
-# pragma pack(push, packing)
-# pragma pack(1)
-# define __pack__
-#elif defined(macintosh)
-# pragma options align=packed
-# define __pack__
-#else
-# error "This program will not work without packed structures"
-#endif
-
-#ifdef _MSC_VER
-# define inline __inline
-#endif
-
-#endif //_TYPES_H
-