Replaced enums by #define's in definitions of word, meta and string types.

[libucw.git] / lib / config.h

diff --git a/lib/config.h b/lib/config.h
index 9e78579f65c0a15329f30d5f4f4b0ab64ed7aed8..74b3a40fc765e3cee954e98507947aa7a662e842 100644 (file)
--- a/lib/config.h
+++ b/lib/config.h
@@ -14,9 +14,13 @@
 
 #include "lib/autoconf.h"
 
+#ifdef CONFIG_MAX_CONTEXTS
+#define CONFIG_CONTEXTS
+#endif
+
 /* Version */
 
-#define SHER_VER "2.4" SHERLOCK_VERSION_SUFFIX
+#define SHER_VER "2.5" SHERLOCK_VERSION_SUFFIX
 
 /* Paths */
 
@@ -46,7 +50,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
@@ -82,6 +86,9 @@ typedef s32 sh_off_t;
 #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.