Removed KMP_ADD_EXTRA_VAR and some useless parenteses.

[libucw.git] / lib / config.h

diff --git a/lib/config.h b/lib/config.h
index 50bf986ab0b4137c3db8ac7eaedbb912b397baec..be3d43fabd48cbc4a6c4cc6f3882a41856f55b30 100644 (file)
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,26 +1,25 @@
 /*
 /*

- *     Sherlock Library -- Configuration-Dependent Definitions
+ *     UCW Library -- Configuration-Dependent Definitions

  *
  *

- *     (c) 1997--1999 Martin Mares, <mj@atrey.karlin.mff.cuni.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 "1.3"
+#ifndef _UCW_CONFIG_H
+#define _UCW_CONFIG_H

 
 

-/* Features */
+/* Configuration switches */

 
 

-#define SHERLOCK_CONFIG_REF_WEIGHTS
-#undef SHERLOCK_CONFIG_LARGE_DB
-#undef SHERLOCK_CONFIG_LFS
+#include "lib/autoconf.h"

 
 /* Types */
 
 typedef unsigned char byte;            /* exactly 8 bits, unsigned */
 typedef signed char sbyte;             /* exactly 8 bits, signed */
 
 /* 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 */
 typedef unsigned short word;           /* exactly 16 bits, unsigned */
 typedef short sword;                   /* exactly 16 bits, signed */
 typedef unsigned short u16;            /* exactly 16 bits, unsigned */


@@ -31,47 +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 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
 
 
 #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;
 typedef s64 sh_off_t;

-#define BYTES_PER_FILE_POINTER 5

 #else
 #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))
-
-#else
-
-#define inline
-#define NONRET
-
+typedef s32 sh_off_t;

 #endif
 
 #endif
 #endif
 
 #endif