summaryrefslogtreecommitdiffstats
path: root/programs/util.h
diff options
context:
space:
mode:
authorPrzemyslaw Skibinski <inikep@gmail.com>2016-12-21 15:10:09 (GMT)
committerPrzemyslaw Skibinski <inikep@gmail.com>2016-12-21 15:10:09 (GMT)
commit973bc79740f571c2b6700cab16a319df9aed2a05 (patch)
treee3ece1e99990ad10a491e7077968072346cf0f3d /programs/util.h
parent4f61505cc40cb8b2c6c371600a427fd685c656a2 (diff)
downloadlz4-973bc79740f571c2b6700cab16a319df9aed2a05.zip
lz4-973bc79740f571c2b6700cab16a319df9aed2a05.tar.gz
lz4-973bc79740f571c2b6700cab16a319df9aed2a05.tar.bz2
util.h and platform.h based on zstd
Diffstat (limited to 'programs/util.h')
-rw-r--r--programs/util.h72
1 files changed, 37 insertions, 35 deletions
diff --git a/programs/util.h b/programs/util.h
index 409f6d7..c670c20 100644
--- a/programs/util.h
+++ b/programs/util.h
@@ -25,26 +25,51 @@ extern "C" {
#endif
+
/*-****************************************
* Dependencies
******************************************/
-#include "platform.h" /* Compiler options, PLATFORM_POSIX_VERSION */
-#include <stdlib.h> /* malloc */
-#include <stddef.h> /* size_t, ptrdiff_t */
-#include <stdio.h> /* fprintf */
-#include <sys/types.h> /* stat, utime */
-#include <sys/stat.h> /* stat */
+#include "platform.h" /* PLATFORM_POSIX_VERSION */
+#include <stdlib.h> /* malloc */
+#include <stddef.h> /* size_t, ptrdiff_t */
+#include <stdio.h> /* fprintf */
+#include <sys/types.h> /* stat, utime */
+#include <sys/stat.h> /* stat */
#if defined(_MSC_VER)
-# include <sys/utime.h> /* utime */
-# include <io.h> /* _chmod */
+# include <sys/utime.h> /* utime */
+# include <io.h> /* _chmod */
#else
# include <unistd.h> /* chown, stat */
# include <utime.h> /* utime */
#endif
-#include <time.h> /* time */
+#include <time.h> /* time */
#include <errno.h>
+
+/*-**************************************************************
+* Basic Types
+*****************************************************************/
+#if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
+# include <stdint.h>
+ typedef uint8_t BYTE;
+ typedef uint16_t U16;
+ typedef int16_t S16;
+ typedef uint32_t U32;
+ typedef int32_t S32;
+ typedef uint64_t U64;
+ typedef int64_t S64;
+#else
+ typedef unsigned char BYTE;
+ typedef unsigned short U16;
+ typedef signed short S16;
+ typedef unsigned int U32;
+ typedef signed int S32;
+ typedef unsigned long long U64;
+ typedef signed long long S64;
+#endif
+
+
/*-****************************************
* Sleep functions: Windows - Posix - others
******************************************/
@@ -81,35 +106,12 @@ extern "C" {
#define LIST_SIZE_INCREASE (8*1024)
-/*-**************************************************************
-* Basic Types
-*****************************************************************/
-#ifndef BASIC_TYPES_DEFINED
-#define BASIC_TYPES_DEFINED
-#if !defined (__VMS) && (defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */) )
-# include <stdint.h>
- typedef uint8_t BYTE;
- typedef uint16_t U16;
- typedef int16_t S16;
- typedef uint32_t U32;
- typedef int32_t S32;
- typedef uint64_t U64;
- typedef int64_t S64;
-#else
- typedef unsigned char BYTE;
- typedef unsigned short U16;
- typedef signed short S16;
- typedef unsigned int U32;
- typedef signed int S32;
- typedef unsigned long long U64;
- typedef signed long long S64;
-#endif
-#endif
-
-
/*-****************************************
* Compiler specifics
******************************************/
+#if defined(__INTEL_COMPILER)
+# pragma warning(disable : 177) /* disable: message #177: function was declared but never referenced, useful with UTIL_STATIC */
+#endif
#if defined(__GNUC__)
# define UTIL_STATIC static __attribute__((unused))
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)