X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=e4c3b33d77f383ac2d89e0f53d5ff2235502ffb4;hb=669b67c13dac4d59bd771a8dc908e2dcfe114845;hp=0cee3ffe02f54693aa16e25e9c30c0349400ec72;hpb=545e490d1b044e8453c54a62b64e4da0d12bee65;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index 0cee3ffe..e4c3b33d 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,86 +1,49 @@
 /*
- *	Sherlock -- Configuration-Dependent Definitions
+ *	UCW Library -- Configuration-Dependent Definitions
  *
- *	(c) 1997--2002 Martin Mares <mj@ucw.cz>
+ *	(c) 1997--2007 Martin Mares <mj@ucw.cz>
+ *	(c) 2006 Robert Spalek <robert@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
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H
 
 /* Configuration switches */
 
-#include "lib/autoconf.h"
-
-/* Version */
-
-#define SHER_VER "2.2a" SHER_SUFFIX
-
-/* Paths */
+#include "autoconf.h"
 
-#define DEFAULT_CONFIG "cf/sherlock"
-
-/* Types */
-
-typedef unsigned char byte;		/* exactly 8 bits, unsigned */
-typedef signed char sbyte;		/* exactly 8 bits, signed */
-typedef unsigned short word;		/* exactly 16 bits, unsigned */
-typedef short sword;			/* exactly 16 bits, signed */
-typedef unsigned short u16;		/* exactly 16 bits, unsigned */
-typedef short s16;			/* exactly 16 bits, signed */
-typedef unsigned int u32;		/* exactly 32 bits, unsigned */
-typedef int s32;			/* exactly 32 bits, signed */
-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 */
+/* Tell libc we're going to use all extensions available */
 
-#ifndef NULL
-#define NULL (void *)0
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 
-typedef u32 oid_t;			/* Object ID */
+/* Types (based on standard C99 integers) */
 
-/* Custom stuff */
+#include <stddef.h>
+#include <stdint.h>
 
-#include "lib/custom.h"
+typedef uint8_t byte;			/* exactly 8 bits, unsigned */
+typedef uint8_t u8;			/* exactly 8 bits, unsigned */
+typedef int8_t s8;			/* exactly 8 bits, signed */
+typedef uint16_t u16;			/* exactly 16 bits, unsigned */
+typedef int16_t s16;			/* exactly 16 bits, signed */
+typedef uint32_t u32;			/* exactly 32 bits, unsigned */
+typedef int32_t s32;			/* exactly 32 bits, signed */
+typedef uint64_t u64;			/* exactly 64 bits, unsigned */
+typedef int64_t s64;			/* exactly 64 bits, signed */
 
-/* Data types and functions for accessing file positions */
+typedef unsigned int uns;		/* at least 32 bits */
+typedef u32 sh_time_t;			/* seconds since UNIX epoch */
+typedef s64 timestamp_t;		/* milliseconds since UNIX epoch */
 
-#ifdef SHERLOCK_CONFIG_LARGE_DB
+#ifdef CONFIG_LARGE_FILES		/* File positions */
 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)
 #else
 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)
-#endif
-
-/* Misc */
-
-#ifdef __GNUC__
-
-#undef inline
-#define NONRET __attribute__((noreturn))
-#define UNUSED __attribute__((unused))
-#define CONSTRUCTOR __attribute__((constructor))
-#define PACKED __attribute__((packed))
-
-#else
-#error This program requires the GNU C compiler.
 #endif
 
 #endif