Added a simple threading helper module.

[libucw.git] / lib / config.h

diff --git a/lib/config.h b/lib/config.h
index b51a943d97bd7ebc5069b347dc59f132136ea175..6f24c6d57253f2f65da05c2d4237f5edbe8ef838 100644 (file)
--- a/lib/config.h
+++ b/lib/config.h
@@ -1,31 +1,26 @@
 /*
 /*

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

  *
  *

- *     (c) 1997--2002 Martin Mares <mj@ucw.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.
  */
 
  *
  *     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

 
 /* Configuration switches */
 
 #include "lib/autoconf.h"
 
 
 /* Configuration switches */
 
 #include "lib/autoconf.h"
 

-/* Version */
-
-#define SHER_VER "2.2" SHERLOCK_VERSION_SUFFIX
-
-/* Paths */
-
-#define DEFAULT_CONFIG "cf/sherlock"
-

 /* 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 */


@@ -42,49 +37,24 @@ typedef unsigned int sh_time_t;             /* Timestamp */
 #define NULL (void *)0
 #endif
 
 #define NULL (void *)0
 #endif
 

-typedef u32 oid_t;                     /* Object ID */
-
-/* Data types and functions for accessing file positions */
-
-#ifdef SHERLOCK_CONFIG_LARGE_DB
+#ifdef CONFIG_LARGE_FILES              /* File positions */

 typedef s64 sh_off_t;
 typedef s64 sh_off_t;

-#define BYTES_PER_O 5
+#else
+typedef s32 sh_off_t;
+#endif
+
+#ifdef CPU_64BIT_POINTERS

 #define BYTES_PER_P 8
 #define BYTES_PER_P 8

-#define bgeto(f) bget5(f)
-#define bputo(f,l) bput5(f,l)

 #define bgetp(f) bgetq(f)
 #define bputp(f,l) bputq(f,l)
 #define bgetp(f) bgetq(f)
 #define bputp(f,l) bputq(f,l)

-#define GET_O(p) GET_U40(p)

 #define GET_P(p) GET_U64(p)
 #define GET_P(p) GET_U64(p)

-#define PUT_O(p,x) PUT_U40(p,x)

 #define PUT_P(p,x) PUT_U64(p,x)
 #else
 #define PUT_P(p,x) PUT_U64(p,x)
 #else

-typedef s32 sh_off_t;
-#define BYTES_PER_O 4

 #define BYTES_PER_P 4
 #define BYTES_PER_P 4

-#define bgeto(f) bgetl(f)
-#define bputo(f,l) bputl(f,l)

 #define bgetp(f) bgetl(f)
 #define bputp(f,l) bputl(f,l)
 #define bgetp(f) bgetl(f)
 #define bputp(f,l) bputl(f,l)

-#define GET_O(p) GET_U32(p)

 #define GET_P(p) GET_U32(p)
 #define GET_P(p) GET_U32(p)

-#define PUT_O(p,x) PUT_U32(p,x)

 #define PUT_P(p,x) PUT_U32(p,x)
 #endif
 
 #define PUT_P(p,x) PUT_U32(p,x)
 #endif
 

-/* Misc */
-
-#ifdef __GNUC__
-
-#undef inline
-#define NONRET __attribute__((noreturn))
-#define UNUSED __attribute__((unused))
-#define CONSTRUCTOR __attribute__((constructor))
-#define PACKED __attribute__((packed))
-#define CONST __attribute__((const))
-
-#else
-#error This program requires the GNU C compiler.
-#endif
-

 #endif
 #endif