X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=be3d43fabd48cbc4a6c4cc6f3882a41856f55b30;hb=f17e1caeeb9f234aa131b98659d16475f9d198bd;hp=7b3fab4bc1490ab3d3450b6c1be14f3f14007a35;hpb=1f0c11760668cdc72d22b269dfb5a2031dbebc95;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index 7b3fab4b..be3d43fa 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,26 +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-alpha"
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H
 
-/* Features */
+/* Configuration switches */
 
-#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 */
+#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 */
@@ -31,49 +30,16 @@ 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 */
 
 #ifndef NULL
 #define NULL (void *)0
 #endif
 
-typedef u32 oid_t;			/* Object ID */
-
-#ifdef SHERLOCK_CONFIG_LFS		/* off_t as passed to file functions */
+#ifdef CONFIG_LFS			/* 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;
-#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))
-
-#else
-
-#define inline
-#define NONRET
-#define UNUSED
-
+typedef s32 sh_off_t;
 #endif
 
 #endif