/*
* Sherlock -- Configuration-Dependent Definitions
*
- * (c) 1997--2002 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 */
+/* Configuration switches */
#include "lib/autoconf.h"
-#include "lib/custom.h"
+
+#ifdef CONFIG_MAX_CONTEXTS
+#define CONFIG_CONTEXTS
+#endif
/* Version */
-#define SHER_VER "2.2a" SHER_SUFFIX
+#define SHER_VER "3.3" SHERLOCK_VERSION_SUFFIX
/* Paths */
/* 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
#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
#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
+
+/* Data type for area ID's */
+
+#ifdef CONFIG_AREAS
+typedef u32 area_t;
+#define AREA_NONE 0
+#define AREA_ANY ~0U
+#else
+typedef struct { } area_t;
+#define AREA_NONE (area_t){}
+#define AREA_ANY (area_t){}
#endif
/* Misc */
#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.