--- Frodo4/Src/sysdeps.h	2003/07/09 15:57:06	1.5
+++ Frodo4/Src/sysdeps.h	2007/01/28 13:44:05	1.10
@@ -2,7 +2,7 @@
  *  sysdeps.h - Try to include the right system headers and get other
  *              system-specific stuff right
  *
- *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
+ *  Frodo (C) 1994-1997,2002-2005 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,9 +21,6 @@
 
 #include "sysconfig.h"
 
-extern "C"
-{
-  
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -31,6 +28,9 @@ extern "C"
 #include <errno.h>
 #include <signal.h>
 
+#include <vector>
+using std::vector;
+
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -117,10 +117,6 @@ extern "C"
 #define BROKEN_OS_PROBABLY_AIX
 #endif
 
-#ifdef HAVE_LINUX_JOYSTICK_H
-#include <linux/joystick.h>
-#endif
-
 #ifdef __NeXT__
 #define S_IRUSR S_IREAD
 #define S_IWUSR S_IWRITE
@@ -187,8 +183,26 @@ typedef long int32;
 #error No 4 byte type, you lose.
 #endif
 
+#if SIZEOF_LONG == 8
+typedef unsigned long uint64;
+typedef long int64;
+#elif SIZEOF_LONG_LONG == 8
+typedef unsigned long long uint64;
+typedef long long int64;
+#else
+#error No 8 byte type, you lose.
+#endif
+
+#if SIZEOF_VOID_P == 4
+typedef uint32 uintptr;
+typedef int32 intptr;
+#elif SIZEOF_VOID_P == 8
+typedef uint64 uintptr;
+typedef int64 intptr;
+#else
+#error Unsupported size of pointer
+#endif
+
 #else
 #include <support/SupportDefs.h>
 #endif	// __BEOS__
-
-}