X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconfig.h;h=10c6f6548f6c78e2c3d1d0dd0c69f48c0a01161f;hb=7097fa9587972b0fba1f40172e4c20a908f602df;hp=be3d43fabd48cbc4a6c4cc6f3882a41856f55b30;hpb=46788a2b18539380b290230c13a3d3e90c8ce031;p=libucw.git

diff --git a/lib/config.h b/lib/config.h
index be3d43fa..10c6f654 100644
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,7 +1,8 @@
 /*
  *	UCW Library -- Configuration-Dependent Definitions
  *
- *	(c) 1997--2004 Martin Mares <mj@ucw.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.
@@ -12,31 +13,33 @@
 
 /* Configuration switches */
 
-#include "lib/autoconf.h"
+#include "autoconf.h"
 
-/* Types */
+/* Tell libc we're going to use all extensions available */
 
-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 */
-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
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
 #endif
 
-#ifdef CONFIG_LFS			/* File positions */
+/* Types (based on standard C99 integers) */
+
+#include <stddef.h>
+#include <stdint.h>
+
+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 */
+
+typedef unsigned int uns;		/* at least 32 bits */
+typedef u32 sh_time_t;			/* Timestamp */
+
+#ifdef CONFIG_LARGE_FILES		/* File positions */
 typedef s64 sh_off_t;
 #else
 typedef s32 sh_off_t;