X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=be3d43fabd48cbc4a6c4cc6f3882a41856f55b30;hb=e1ccb1a25eae9368b00589d948cc0e23718f2fbb;hp=608316d500ce5cbdba2c9c885bf67c6afae1e515;hpb=bffd48843d728863b531aeed52e5ca7dc699d990;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index 608316d5..be3d43fa 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,37 +1,25 @@
 /*
- *	Sherlock Library -- Configuration-Dependent Definitions
+ *	UCW Library -- 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 */
-
-#define SHER_VER "2.0"
-
-/* Features */
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H
 
-#define  SHERLOCK_CONFIG_LARGE_DB	/* Support for DB files >4GB */
-#define  SHERLOCK_CONFIG_LFS		/* Large files on 32-bit systems */
-#define  SHERLOCK_CONFIG_LFS_LIBC	/* LFS supported directly by libc */
+/* Configuration switches */
 
-/* CPU characteristics */
-
-#define CPU_LITTLE_ENDIAN
-#undef CPU_BIG_ENDIAN
-#define CPU_ALLOW_UNALIGNED
-#define CPU_STRUCT_ALIGN 4
-
-/* Paths */
-
-#define DEFAULT_CONFIG "cf/sherlock"
+#include "lib/autoconf.h"
 
 /* Types */
 
 typedef unsigned char byte;		/* exactly 8 bits, unsigned */
 typedef signed char sbyte;		/* exactly 8 bits, signed */
+typedef unsigned char u8;		/* exactly 8 bits, unsigned */
+typedef signed char s8;			/* 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 */
@@ -48,44 +36,10 @@ typedef unsigned int sh_time_t;		/* Timestamp */
 #define NULL (void *)0
 #endif
 
-typedef u32 oid_t;			/* Object ID */
-
-/* Data types and functions for accessing file positions */
-
-#ifdef SHERLOCK_CONFIG_LARGE_DB
+#ifdef CONFIG_LFS			/* 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