If `-S' or `-C' is given after some other options (i.e., the config file

[libucw.git] / lib / config.h

diff --git a/lib/config.h b/lib/config.h
index 9ba9b43fa77a50f3db44e26d1056510ed4c4c96b..6ef51ec44f68798ec9f461a7eafbf08b0e24d11f 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 "3.0" SHERLOCK_VERSION_SUFFIX
 
 /* Paths */
 
@@ -83,6 +87,8 @@ typedef s32 sh_off_t;
 #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.