X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=4a6b34d526aae9953473cce0b5dc9eda2b20b99d;hb=bcfb15368033a922fa375d78fb84269e1f9ab11a;hp=114f27359228bedbc462802456a3d071fc97a45f;hpb=13bc5e1c30abb77c6e1120b2e0bf50cd0ab94a6a;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index 114f2735..4a6b34d5 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,27 +1,26 @@
 /*
  *	Sherlock -- Configuration-Dependent Definitions
  *
- *	(c) 1997--2001 Martin Mares <mj@ucw.cz>
+ *	(c) 1997--2004 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
 
-/* Custom configuration */
-
-#include "lib/custom.h"
+/* Configuration switches */
 
-/* Version */
+#include "lib/autoconf.h"
 
-#define SHER_VER "2.0" SHER_SUFFIX
+#ifdef CONFIG_MAX_CONTEXTS
+#define CONFIG_CONTEXTS
+#endif
 
-/* 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 "3.3" SHERLOCK_VERSION_SUFFIX
 
 /* Paths */
 
@@ -51,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
@@ -61,6 +60,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
@@ -71,6 +72,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 */
@@ -82,6 +85,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.