Added macros for hinting branch predictor.

[libucw.git] / lib / config.h

diff --git a/lib/config.h b/lib/config.h
index de3e0a62ca0d30c7dbfaccc999941788dcdc8a1b..cc2d86da15ac5f3ec43f2dd11b6dfb5ae938f4a5 100644 (file)
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,29 +1,22 @@
 /*
- *     Sherlock Library -- Configuration-Dependent Definitions
+ *     Sherlock -- Configuration-Dependent Definitions
  *
- *     (c) 1997--2000 Martin Mares <mj@ucw.cz>
+ *     (c) 1997--2003 Martin Mares <mj@ucw.cz>
+ *
+ *     This software may be freely distributed and used according to the terms
+ *     of the GNU Lesser General Public License.
  */
 
 #ifndef _SHERLOCK_CONFIG_H
 #define _SHERLOCK_CONFIG_H
 
-/* Version */
-
-#define SHER_VER "2.0"
+/* Configuration switches */
 
-/* Features */
+#include "lib/autoconf.h"
 
-#define  SHERLOCK_CONFIG_LARGE_DB      /* Support for DB files >4GB */
-#define  SHERLOCK_CONFIG_LFS           /* Large files on 32-bit systems */
-#define  SHERLOCK_CONFIG_LFS_LIBC      /* LFS supported directly by libc */
-
-/* CPU characteristics */
+/* Version */
 
-#define CPU_LITTLE_ENDIAN
-#undef CPU_BIG_ENDIAN
-#define CPU_ALLOW_UNALIGNED
-#define CPU_STRUCT_ALIGN 4
-#undef CPU_64BIT_POINTERS
+#define SHER_VER "2.5" SHERLOCK_VERSION_SUFFIX
 
 /* Paths */
 
@@ -53,7 +46,7 @@ typedef u32 oid_t;                    /* Object ID */
 
 /* Data types and functions for accessing file positions */
 
-#ifdef SHERLOCK_CONFIG_LARGE_DB
+#ifdef CONFIG_LARGE_DB
 typedef s64 sh_off_t;
 #define BYTES_PER_O 5
 #define BYTES_PER_P 8
@@ -63,6 +56,8 @@ typedef s64 sh_off_t;
 #define bputp(f,l) bputq(f,l)
 #define GET_O(p) GET_U40(p)
 #define GET_P(p) GET_U64(p)
+#define PUT_O(p,x) PUT_U40(p,x)
+#define PUT_P(p,x) PUT_U64(p,x)
 #else
 typedef s32 sh_off_t;
 #define BYTES_PER_O 4
@@ -73,6 +68,8 @@ typedef s32 sh_off_t;
 #define bputp(f,l) bputl(f,l)
 #define GET_O(p) GET_U32(p)
 #define GET_P(p) GET_U32(p)
+#define PUT_O(p,x) PUT_U32(p,x)
+#define PUT_P(p,x) PUT_U32(p,x)
 #endif
 
 /* Misc */
@@ -84,6 +81,10 @@ typedef s32 sh_off_t;
 #define UNUSED __attribute__((unused))
 #define CONSTRUCTOR __attribute__((constructor))
 #define PACKED __attribute__((packed))
+#define CONST __attribute__((const))
+#define PURE __attribute__((const))
+#define likely(x) __builtin_expect((x),1)
+#define unlikely(x) __builtin_expect((x),0)
 
 #else
 #error This program requires the GNU C compiler.