diff --git a/BasiliskII/src/BeOS/sysdeps.h b/BasiliskII/src/BeOS/sysdeps.h
index 8575082b..b68404dd 100644
--- a/BasiliskII/src/BeOS/sysdeps.h
+++ b/BasiliskII/src/BeOS/sysdeps.h
@@ -62,7 +62,11 @@ typedef off_t loff_t;
 #define uae_u16 uint16
 #define uae_s32 int32
 #define uae_u32 uint32
+#define uae_s64 int64
+#define uae_u64 uint64
 typedef uae_u32 uaecptr;
+#define VAL64(a) (a ## LL)
+#define UVAL64(a) (a ## uLL)
 
 // UAE CPU defines
 #ifdef __i386__
diff --git a/BasiliskII/src/Unix/sysdeps.h b/BasiliskII/src/Unix/sysdeps.h
index aa5498a8..ab6fb07e 100644
--- a/BasiliskII/src/Unix/sysdeps.h
+++ b/BasiliskII/src/Unix/sysdeps.h
@@ -96,9 +96,13 @@ typedef long int32;
 #if SIZEOF_LONG == 8
 typedef unsigned long uint64;
 typedef long int64;
+#define VAL64(a) (a ## l)
+#define UVAL64(a) (a ## ul)
 #elif SIZEOF_LONG_LONG == 8
 typedef unsigned long long uint64;
 typedef long long int64;
+#define VAL64(a) (a ## LL)
+#define UVAL64(a) (a ## uLL)
 #else
 #error "No 8 byte type, you lose."
 #endif
diff --git a/BasiliskII/src/uae_cpu/fpp.cpp b/BasiliskII/src/uae_cpu/fpp.cpp
index 0975077c..5d5583a0 100644
--- a/BasiliskII/src/uae_cpu/fpp.cpp
+++ b/BasiliskII/src/uae_cpu/fpp.cpp
@@ -368,7 +368,7 @@ static __inline__ double to_exten(uae_u32 wrd1, uae_u32 wrd2, uae_u32 wrd3)
 		if( wrd2 | wrd3 ) {
 			// mantissa, not fraction.
 			uae_u64 man = ((uae_u64)wrd2 << 32) | wrd3;
-			while( (man & 0x8000000000000000LL) == 0 ) {
+			while( (man & UVAL64(0x8000000000000000)) == 0 ) {
 				man <<= 1;
 				exp--;
 			}