/*
* Sherlock -- Configuration-Dependent Definitions
*
- * (c) 1997--2001 Martin Mares <mj@ucw.cz>
+ * (c) 1997--2002 Martin Mares <mj@ucw.cz>
*/
#ifndef _SHERLOCK_CONFIG_H
#define _SHERLOCK_CONFIG_H
-/* Custom configuration */
+/* Configuration switches */
-#include "lib/custom.h"
+#include "lib/autoconf.h"
/* Version */
-#define SHER_VER "2.0" SHER_SUFFIX
-
-/* CPU characteristics */
-
-#define CPU_I386
-#define CPU_LITTLE_ENDIAN
-#undef CPU_BIG_ENDIAN
-#define CPU_ALLOW_UNALIGNED
-#define CPU_STRUCT_ALIGN 4
-#undef CPU_64BIT_POINTERS
-
-/* OS characteristics */
-
-#define CONFIG_LINUX
+#define SHER_VER "2.2a" SHER_SUFFIX
/* Paths */
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
#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
/* Misc */
#define UNUSED __attribute__((unused))
#define CONSTRUCTOR __attribute__((constructor))
#define PACKED __attribute__((packed))
+#define CONST __attribute__((const))
#else
#error This program requires the GNU C compiler.