From afd0a108c0c2313bcede29bf758f835c4c4bf085 Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Mon, 13 Nov 2006 22:00:11 +0000
Subject: AMD64 fixes.

---
 include/Main.h    |  3 ++-
 include/generic.h | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/Main.h b/include/Main.h
index 8b404dc..8b03a3e 100644
--- a/include/Main.h
+++ b/include/Main.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: Main.h,v 1.19 2006-02-01 20:39:37 pixel Exp $ */
+/* $Id: Main.h,v 1.20 2006-11-13 22:00:11 pixel Exp $ */
 
 #ifndef __MAIN_H__
 #define __MAIN_H__
@@ -40,6 +40,7 @@ class Main : public Base {
     bool setted;
   private:
     void set_args(int, char **, char **);
+    static void sanity_checks() throw (GeneralException);
     
 };
 
diff --git a/include/generic.h b/include/generic.h
index 107ec2b..3c7e7e9 100644
--- a/include/generic.h
+++ b/include/generic.h
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: generic.h,v 1.39 2006-07-17 16:06:17 pixel Exp $ */
+/* $Id: generic.h,v 1.40 2006-11-13 22:00:11 pixel Exp $ */
 
 #ifndef __GENERIC_H__
 #define __GENERIC_H__
@@ -69,12 +69,20 @@ typedef u32 DWord;
 #else
 
 #if ! defined SDL_VERSIONNUM && ! defined Uint32
+#ifdef __amd64
+typedef unsigned int Uint32;
+#else
 typedef unsigned long int Uint32;
 #endif
+#endif
 
 #ifndef int32
+#ifdef __amd64
+typedef signed int int32;
+#else
 typedef signed long int int32;
 #endif
+#endif
 
 #ifndef Uint16
 typedef unsigned short int Uint16;
-- 
cgit v1.2.3