X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=6f24c6d57253f2f65da05c2d4237f5edbe8ef838;hb=1e346d26a03735f09bba33ddbaba4cc9b268d381;hp=a699aa22c1fc46a614746be3ae6467f3774ef66d;hpb=fc517f37630d14dc3db61503fd29ba44caacf9a0;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index a699aa22..6f24c6d5 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,52 +1,60 @@
 /*
- *	Sherlock Library -- Configuration-Dependent Definitions
+ *	UCW Library -- Configuration-Dependent Definitions
  *
- *	(c) 1997, 1998 Martin Mares, <mj@atrey.karlin.mff.cuni.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
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H
 
-/* Version */
+/* Configuration switches */
 
-#define SHER_VER "1.1"
+#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 int ulg;		/* exactly 32 bits, unsigned */
-typedef int slg;			/* exactly 32 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 */
 
 #ifndef NULL
 #define NULL (void *)0
 #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))
-
+#ifdef CONFIG_LARGE_FILES		/* File positions */
+typedef s64 sh_off_t;
 #else
+typedef s32 sh_off_t;
+#endif
 
-#define inline
-#define NONRET
-
+#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
+#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