X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=6f24c6d57253f2f65da05c2d4237f5edbe8ef838;hb=66f968af299fe8ce6ba65b38fd3cb477e9112818;hp=761751e3da822a65bca75cafc815cbeb40653587;hpb=c229655df92f9f2fc68fa62136e4b1f3a504ed56;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index 761751e3..6f24c6d5 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,30 +1,26 @@
 /*
- *	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>
+ *	(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
-
-/* Version */
-
-#define SHER_VER "2.0-alpha"
-
-/* Features */
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H
 
-#undef  SHERLOCK_CONFIG_LARGE_DB	/* Support for DB files >4GB */
-#undef  SHERLOCK_CONFIG_LFS		/* Large files on 32-bit systems */
-#undef  SHERLOCK_CONFIG_LFS_LIBC	/* LFS supported directly by libc */
+/* Configuration switches */
 
-/* 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 */
@@ -41,42 +37,24 @@ typedef unsigned int sh_time_t;		/* Timestamp */
 #define NULL (void *)0
 #endif
 
-typedef u32 oid_t;			/* Object ID */
-
-#ifdef SHERLOCK_CONFIG_LFS		/* off_t as passed to file functions */
+#ifdef CONFIG_LARGE_FILES		/* File positions */
 typedef s64 sh_off_t;
-#define BYTES_PER_FILE_POINTER 5
-#else
-typedef int sh_off_t;
-#define BYTES_PER_FILE_POINTER 4
-#endif
-
-#ifdef SHERLOCK_CONFIG_LARGE_DB		/* off_t as present in database files */
-typedef s64 sh_foff_t;
 #else
-typedef s32 sh_foff_t;
+typedef s32 sh_off_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))
-
+#ifdef CPU_64BIT_POINTERS
+#define BYTES_PER_P 8
+#define bgetp(f) bgetq(f)
+#define bputp(f,l) bputq(f,l)
+#define GET_P(p) GET_U64(p)
+#define PUT_P(p,x) PUT_U64(p,x)
 #else
-#error This program requires the GNU C compiler.
+#define BYTES_PER_P 4
+#define bgetp(f) bgetl(f)
+#define bputp(f,l) bputl(f,l)
+#define GET_P(p) GET_U32(p)
+#define PUT_P(p,x) PUT_U32(p,x)
 #endif
 
 #endif