Changeset 3525 for trunk/kLdr/kLdr.h

Timestamp:

Aug 20, 2007, 12:14:55 AM (18 years ago)

Author:

bird

Message:

made the format headers usable externally.

File:

• trunk/kLdr/kLdr.h (modified) (3 diffs)

trunk/kLdr/kLdr.h

@@ -25 +25 @@
  */
 
-#ifndef __kLdr_h__
-#define __kLdr_h__
+#ifndef ___kLdr_h___
+#define ___kLdr_h___
 
 #ifdef __cplusplus
@@ -33 +33 @@
 
 /*
- * kLdr depend on size_t, [u]intNN_t, [u]intptr_t and some related constants.
- * If KLDR_NO_KLDR_H_INCLUDES is defined, these has already been defined.
- */
-#ifndef KLDR_NO_KLDR_H_INCLUDES
-# include <sys/types.h>
-# include <stddef.h>
-# ifdef _MSC_VER
-   typedef signed char          int8_t;
-   typedef unsigned char        uint8_t;
-   typedef signed short         int16_t;
-   typedef unsigned short       uint16_t;
-   typedef signed int           int32_t;
-   typedef unsigned int         uint32_t;
-   typedef signed __int64       int64_t;
-   typedef unsigned __int64     uint64_t;
-   typedef int64_t              intmax_t;
-   typedef uint64_t             uintmax_t;
-#  define UINT8_C(c)            (c)
-#  define UINT16_C(c)           (c)
-#  define UINT32_C(c)           (c ## U)
-#  define UINT64_C(c)           (c ## ULL)
-#  define INT8_C(c)             (c)
-#  define INT16_C(c)            (c)
-#  define INT32_C(c)            (c)
-#  define INT64_C(c)            (c ## LL)
-#  define INT8_MIN              (INT8_C(-0x7f) - 1)
-#  define INT16_MIN             (INT16_C(-0x7fff) - 1)
-#  define INT32_MIN             (INT32_C(-0x7fffffff) - 1)
-#  define INT64_MIN             (INT64_C(-0x7fffffffffffffff) - 1)
-#  define INT8_MAX              INT8_C(0x7f)
-#  define INT16_MAX             INT16_C(0x7fff)
-#  define INT32_MAX             INT32_C(0x7fffffff)
-#  define INT64_MAX             INT64_C(0x7fffffffffffffff)
-#  define UINT8_MAX             UINT8_C(0xff)
-#  define UINT16_MAX            UINT16_C(0xffff)
-#  define UINT32_MAX            UINT32_C(0xffffffff)
-#  define UINT64_MAX            UINT64_C(0xffffffffffffffff)
-# else
-#  include <stdint.h>
-# endif
-#endif /* !KLDR_NO_KLDR_H_INCLUDES */
+ * Include the base typedefs and macros.
+ */
+#include "kLdrBase.h"
 
 
@@ -640 +602 @@
     KLDRENDIAN_32BIT_HACK = 0x7fffffff
 } KLDRENDIAN;
-
-
-/** @def KLDR_LITTLE_ENDIAN
- * The kLdr build is for a little endian target. */
-/** @def KLDR_BIG_ENDIAN
- * The kLdr build is for a big endian target. */
-#if !defined(KLDR_LITTLE_ENDIAN) && !defined(KLDR_BIG_ENDIAN)
-# define KLDR_LITTLE_ENDIAN
-#endif
-#ifdef __DOXYGEN__
-# define KLDR_BIG_ENDIAN
-#endif