Index: jinclude.h |
diff --git a/jinclude.h b/jinclude.h |
index 0a4f15146aeb2070601838439e169509f6fe5b7d..d461a1aa16f43b8abaa1ba08afcebc2a264f68c9 100644 |
--- a/jinclude.h |
+++ b/jinclude.h |
@@ -1,9 +1,12 @@ |
/* |
* jinclude.h |
* |
+ * This file was part of the Independent JPEG Group's software: |
* Copyright (C) 1991-1994, Thomas G. Lane. |
- * This file is part of the Independent JPEG Group's software. |
- * For conditions of distribution and use, see the accompanying README file. |
+ * It was modified by The libjpeg-turbo Project to include only code relevant |
+ * to libjpeg-turbo. |
+ * For conditions of distribution and use, see the accompanying README.ijg |
+ * file. |
* |
* This file exists to provide a single place to fix any problems with |
* including the wrong system include files. (Common problems are taken |
@@ -17,8 +20,8 @@ |
/* Include auto-config file to find out which system include files we need. */ |
-#include "jconfig.h" /* auto configuration options */ |
-#define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ |
+#include "jconfig.h" /* auto configuration options */ |
+#define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ |
/* |
* We need the NULL macro and size_t typedef. |
@@ -58,28 +61,18 @@ |
#ifdef NEED_BSD_STRINGS |
#include <strings.h> |
-#define MEMZERO(target,size) bzero((void *)(target), (size_t)(size)) |
-#define MEMCOPY(dest,src,size) bcopy((const void *)(src), (void *)(dest), (size_t)(size)) |
+#define MEMZERO(target,size) bzero((void *)(target), (size_t)(size)) |
+#define MEMCOPY(dest,src,size) bcopy((const void *)(src), (void *)(dest), (size_t)(size)) |
#else /* not BSD, assume ANSI/SysV string lib */ |
#include <string.h> |
-#define MEMZERO(target,size) memset((void *)(target), 0, (size_t)(size)) |
-#define MEMCOPY(dest,src,size) memcpy((void *)(dest), (const void *)(src), (size_t)(size)) |
+#define MEMZERO(target,size) memset((void *)(target), 0, (size_t)(size)) |
+#define MEMCOPY(dest,src,size) memcpy((void *)(dest), (const void *)(src), (size_t)(size)) |
#endif |
/* |
- * In ANSI C, and indeed any rational implementation, size_t is also the |
- * type returned by sizeof(). However, it seems there are some irrational |
- * implementations out there, in which sizeof() returns an int even though |
- * size_t is defined as long or unsigned long. To ensure consistent results |
- * we always use this SIZEOF() macro in place of using sizeof() directly. |
- */ |
- |
-#define SIZEOF(object) ((size_t) sizeof(object)) |
- |
-/* |
* The modules that use fread() and fwrite() always invoke them through |
* these macros. On some systems you may need to twiddle the argument casts. |
* CAUTION: argument order is different from underlying functions! |