X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=4a6b34d526aae9953473cce0b5dc9eda2b20b99d;hb=3d60a4fe8e95194666956fe7e861101f40571630;hp=e5b355280a16c9a3c98f2f0d76944fa05ef40a90;hpb=ecfc630aa23529c07c8a9459608a2619479a7421;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index e5b35528..4a6b34d5 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,21 +1,26 @@
 /*
- *	Sherlock Library -- Configuration-Dependent Definitions
+ *	Sherlock -- Configuration-Dependent Definitions
  *
- *	(c) 1997--2000 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
 
-/* Version */
+/* Configuration switches */
+
+#include "lib/autoconf.h"
 
-#define SHER_VER "2.0-alpha"
+#ifdef CONFIG_MAX_CONTEXTS
+#define CONFIG_CONTEXTS
+#endif
 
-/* Features */
+/* Version */
 
-#undef  SHERLOCK_CONFIG_LARGE_DB	/* Support for DB files >4GB */
-#undef  SHERLOCK_CONFIG_LFS		/* Large files on 32-bit systems */
-#undef  SHERLOCK_CONFIG_LFS_LIBC	/* LFS supported directly by libc */
+#define SHER_VER "3.3" SHERLOCK_VERSION_SUFFIX
 
 /* Paths */
 
@@ -35,6 +40,7 @@ typedef unsigned int uns;		/* at least 32 bits */
 typedef unsigned long long int u64;	/* exactly 64 bits, unsigned */
 typedef long long int s64;		/* exactly 64 bits, signed */
 typedef unsigned long addr_int_t;	/* Both integer and address */
+typedef unsigned int sh_time_t;		/* Timestamp */
 
 #ifndef NULL
 #define NULL (void *)0
@@ -42,28 +48,34 @@ typedef unsigned long addr_int_t;	/* Both integer and address */
 
 typedef u32 oid_t;			/* Object ID */
 
-#ifdef SHERLOCK_CONFIG_LFS		/* off_t as passed to file functions */
-typedef s64 sh_off_t;
-#define BYTES_PER_FILE_POINTER 5
-#else
-typedef int sh_off_t;
-#define BYTES_PER_FILE_POINTER 4
-#endif
+/* Data types and functions for accessing file positions */
 
-#ifdef SHERLOCK_CONFIG_LARGE_DB		/* off_t as present in database files */
-typedef s64 sh_foff_t;
+#ifdef CONFIG_LARGE_DB
+typedef s64 sh_off_t;
+#define BYTES_PER_O 5
+#define BYTES_PER_P 8
+#define bgeto(f) bget5(f)
+#define bputo(f,l) bput5(f,l)
+#define bgetp(f) bgetq(f)
+#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_foff_t;
+typedef s32 sh_off_t;
+#define BYTES_PER_O 4
+#define BYTES_PER_P 4
+#define bgeto(f) bgetl(f)
+#define bputo(f,l) bputl(f,l)
+#define bgetp(f) bgetl(f)
+#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
 
-/* CPU characteristics */
-
-#define CPU_LITTLE_ENDIAN
-#undef CPU_BIG_ENDIAN
-#define CPU_CAN_DO_UNALIGNED_WORDS
-#define CPU_CAN_DO_UNALIGNED_LONGS
-#define CPU_STRUCT_ALIGN 4
-
 /* Misc */
 
 #ifdef __GNUC__
@@ -72,6 +84,11 @@ typedef s32 sh_foff_t;
 #define NONRET __attribute__((noreturn))
 #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.