X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=cc2d86da15ac5f3ec43f2dd11b6dfb5ae938f4a5;hb=f874b43fb65e4fadc591319f1aea6084bb72254b;hp=c6e7c7509aae426cc9427f9b4524bfdce99faf4a;hpb=ae9721feabb6690778d9bc6751f6a6f434cdbeaf;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index c6e7c750..cc2d86da 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,7 +1,10 @@
 /*
  *	Sherlock -- Configuration-Dependent Definitions
  *
- *	(c) 1997--2002 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
@@ -13,7 +16,7 @@
 
 /* Version */
 
-#define SHER_VER "2.2a" SHER_SUFFIX
+#define SHER_VER "2.5" SHERLOCK_VERSION_SUFFIX
 
 /* Paths */
 
@@ -41,13 +44,9 @@ typedef unsigned int sh_time_t;		/* Timestamp */
 
 typedef u32 oid_t;			/* Object ID */
 
-/* Custom stuff */
-
-#include "lib/custom.h"
-
 /* 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
@@ -83,6 +82,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.