X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fconfig.h;h=0f7179d1fd3b15d934500ffab9e2dcb3ce42b58b;hb=d852cb0153c20c45b960748ee39c530ee77266f5;hp=50bf986ab0b4137c3db8ac7eaedbb912b397baec;hpb=824c295c7aebba96d28f8aaa9da317eca3e2225f;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index 50bf986a..0f7179d1 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,21 +1,30 @@
 /*
- *	Sherlock Library -- Configuration-Dependent Definitions
+ *	Sherlock -- Configuration-Dependent Definitions
  *
- *	(c) 1997--1999 Martin Mares, <mj@atrey.karlin.mff.cuni.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
 
+/* Configuration switches */
+
+#include "lib/autoconf.h"
+
+#ifdef CONFIG_MAX_CONTEXTS
+#define CONFIG_CONTEXTS
+#endif
+
 /* Version */
 
-#define SHER_VER "1.3"
+#define SHER_VER "3.3" SHERLOCK_VERSION_SUFFIX
 
-/* Features */
+/* Paths */
 
-#define SHERLOCK_CONFIG_REF_WEIGHTS
-#undef SHERLOCK_CONFIG_LARGE_DB
-#undef SHERLOCK_CONFIG_LFS
+#define DEFAULT_CONFIG "cf/sherlock"
 
 /* Types */
 
@@ -31,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
@@ -38,40 +48,62 @@ 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 */
+/* Data types and functions for accessing file positions */
+
+#ifdef CONFIG_LARGE_DB
 typedef s64 sh_off_t;
-#define BYTES_PER_FILE_POINTER 5
+#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 int sh_off_t;
-#define BYTES_PER_FILE_POINTER 4
+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
 
-#ifdef SHERLOCK_CONFIG_LARGE_DB		/* off_t as present in database files */
-typedef s64 sh_foff_t;
+/* Data type for area ID's */
+
+#ifdef CONFIG_AREAS
+typedef u32 area_t;
+#define AREA_NONE 0
+#define AREA_ANY ~0U
 #else
-typedef s32 sh_foff_t;
+typedef struct { } area_t;
+#define AREA_NONE (area_t){}
+#define AREA_ANY (area_t){}
 #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__
 
 #undef inline
 #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
-
-#define inline
-#define NONRET
-
+#error This program requires the GNU C compiler.
 #endif
 
 #endif