X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fconfig.h;h=22140f203936af25076dc475185fcbaa6c68cd1f;hb=dd75207a4704b75d36e1a7afbc4ad81c1380d8df;hp=62ef1af356452fe52374ae3e6a47bc91f3feab24;hpb=9d5027b958e0ed7d2fa2c804fd255d686e8da5a7;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index 62ef1af3..22140f20 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,45 +1,49 @@
 /*
- *	Sherlock Library -- Configuration-Dependent Definitions
+ *	UCW Library -- Configuration-Dependent Definitions
  *
- *	(c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.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.
  */
 
-/* Version */
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H
 
-#define SHER_VER "0.1"
+/* Configuration switches */
 
-/* Types */
+#include "lib/autoconf.h"
 
-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 int ulg;		/* exactly 32 bits, unsigned */
-typedef int slg;			/* exactly 32 bits, signed */
-typedef unsigned int uns;		/* at least 32 bits */
+/* Tell libc we're going to use all extensions available */
 
-/* CPU characteristics */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 
-#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
+/* Types (based on standard C99 integers) */
 
-/* Misc */
+#include <stddef.h>
+#include <stdint.h>
 
-#ifdef __GNUC__
+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 */
 
-#undef inline
-#define NONRET __attribute__((noreturn))
+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 CONFIG_LARGE_FILES		/* File positions */
+typedef s64 sh_off_t;
 #else
-
-#define inline
-#define NONRET
-
+typedef s32 sh_off_t;
 #endif
 
-#ifdef linux
-#define HAVE_FFS
 #endif