From 68e29fb6fce2f94dd1e7252dab3d7d182ab52d73 Mon Sep 17 00:00:00 2001
From: Gregor Schneider <grschneider@gmail.com>
Date: Mon, 2 May 2011 21:01:14 +0000
Subject: [PATCH] [libjpeg] Forgotten files from r51559

svn path=/trunk/; revision=51561
---
 reactos/include/reactos/libs/libjpeg/jmorecfg.h | 4 ----
 reactos/include/reactos/libs/libjpeg/jpeglib.h  | 8 +++++---
 reactos/include/reactos/libs/libjpeg/jversion.h | 6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/reactos/include/reactos/libs/libjpeg/jmorecfg.h b/reactos/include/reactos/libs/libjpeg/jmorecfg.h
index ce741f84c6e..b543a04fd55 100644
--- a/reactos/include/reactos/libs/libjpeg/jmorecfg.h
+++ b/reactos/include/reactos/libs/libjpeg/jmorecfg.h
@@ -23,10 +23,6 @@
 
 #define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
 
-#if (defined (_MSC_VER) && (_MSC_VER >= 800))
-#define HAVE_UNSIGNED_CHAR
-#define EXTERN(type)  extern type __cdecl
-#endif
 
 /*
  * Maximum number of components (color channels) allowed in JPEG image.
diff --git a/reactos/include/reactos/libs/libjpeg/jpeglib.h b/reactos/include/reactos/libs/libjpeg/jpeglib.h
index 5039d4bf4c4..1eb1fac033f 100644
--- a/reactos/include/reactos/libs/libjpeg/jpeglib.h
+++ b/reactos/include/reactos/libs/libjpeg/jpeglib.h
@@ -2,7 +2,7 @@
  * jpeglib.h
  *
  * Copyright (C) 1991-1998, Thomas G. Lane.
- * Modified 2002-2009 by Guido Vollbeding.
+ * Modified 2002-2010 by Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -33,11 +33,13 @@ extern "C" {
 #endif
 #endif
 
-/* Version ID for the JPEG library.
+/* Version IDs for the JPEG library.
  * Might be useful for tests like "#if JPEG_LIB_VERSION >= 80".
  */
 
-#define JPEG_LIB_VERSION  80	/* Version 8.0 */
+#define JPEG_LIB_VERSION        80	/* Compatibility version 8.0 */
+#define JPEG_LIB_VERSION_MAJOR  8
+#define JPEG_LIB_VERSION_MINOR  3
 
 
 /* Various constants determining the sizes of things.
diff --git a/reactos/include/reactos/libs/libjpeg/jversion.h b/reactos/include/reactos/libs/libjpeg/jversion.h
index 70c8b6fe176..e868538c884 100644
--- a/reactos/include/reactos/libs/libjpeg/jversion.h
+++ b/reactos/include/reactos/libs/libjpeg/jversion.h
@@ -1,7 +1,7 @@
 /*
  * jversion.h
  *
- * Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
+ * Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -9,6 +9,6 @@
  */
 
 
-#define JVERSION	"8b  16-May-2010"
+#define JVERSION	"8c  16-Jan-2011"
 
-#define JCOPYRIGHT	"Copyright (C) 2010, Thomas G. Lane, Guido Vollbeding"
+#define JCOPYRIGHT	"Copyright (C) 2011, Thomas G. Lane, Guido Vollbeding"