From 61b51855a825c7ac45c1cf438be063a12d86a39a Mon Sep 17 00:00:00 2001 From: asfernandes Date: Sun, 20 Jan 2008 23:51:21 +0000 Subject: [PATCH] Misc --- src/jrd/license.h | 6 +++--- src/jrd/pag.cpp | 2 +- src/remote/protocol.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jrd/license.h b/src/jrd/license.h index 0be88741a5..379f33d1ac 100644 --- a/src/jrd/license.h +++ b/src/jrd/license.h @@ -122,12 +122,12 @@ #ifdef DARWIN #if defined(i386) || defined(__x86_64__) -#define FB_PLATFORM "UI" /* Darwin/Intel */ +#define FB_PLATFORM "UI" /* Darwin/Intel */ #endif -#endif -#if defined(DARWIN) && defined(_powerpc_) +#if defined(_powerpc_) #define FB_PLATFORM "UP" /* Darwin/PowerPC */ #endif +#endif // DARWIN #ifndef FB_VERSION #define FB_VERSION FB_PLATFORM "-" FB_BUILD_TYPE FB_MAJOR_VER "." FB_MINOR_VER "." FB_REV_NO "." FB_BUILD_NO " " FB_BUILD_SUFFIX diff --git a/src/jrd/pag.cpp b/src/jrd/pag.cpp index 5835ec4574..96143c559f 100644 --- a/src/jrd/pag.cpp +++ b/src/jrd/pag.cpp @@ -320,7 +320,7 @@ const SSHORT CLASS = CLASS_DARWIN_X64; #ifdef powerpc const SSHORT CLASS = CLASS_DARWIN_PPC; #endif -#endif +#endif // DARWIN static const char* const SCRATCH = "fb_table_"; static const int MIN_EXTEND_BYTES = 128 * 1024; // 128KB diff --git a/src/remote/protocol.h b/src/remote/protocol.h index 53e153dccd..ab52f71572 100644 --- a/src/remote/protocol.h +++ b/src/remote/protocol.h @@ -145,9 +145,9 @@ typedef enum arch_linux = 36, arch_freebsd = 37, arch_netbsd = 38, - arch_darwin_ppc = 39, + arch_darwin_ppc = 39, arch_winnt_64 = 40, - arch_darwin_64 = 41, + arch_darwin_64 = 41, arch_max = 42 /* Keep this at the end */ } P_ARCH;