summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/libjpeg
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2012-03-29 21:56:18 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2012-03-29 21:56:18 +0000
commit647311cde14cdfd10c9b87c0b7d91e084e905697 (patch)
tree1099e22bd6df0da85dd77c607c331f42546fdc50 /src/lib/libjpeg
parentf7a94cda02c0664c3e89f6a70e7c297ccbb72a78 (diff)
Allow compilation with compatible system-installed versions of libjpeg and libflac [wallyweek, R. Belmont]
Diffstat (limited to 'src/lib/libjpeg')
-rw-r--r--src/lib/libjpeg/jpeglib.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/libjpeg/jpeglib.h b/src/lib/libjpeg/jpeglib.h
index 9f57e8d596c..ea9ac43796f 100644
--- a/src/lib/libjpeg/jpeglib.h
+++ b/src/lib/libjpeg/jpeglib.h
@@ -11,6 +11,13 @@
* and perhaps jerror.h if they want to know the exact error codes.
*/
+#ifdef USE_SYSTEM_JPEGLIB
+#ifndef XMD_H
+#define XMD_H
+#endif
+#include <jpeglib.h>
+#else
+
#ifndef JPEGLIB_H
#define JPEGLIB_H
@@ -1156,5 +1163,5 @@ struct jpeg_color_quantizer { long dummy; };
}
#endif
#endif
-
#endif /* JPEGLIB_H */
+#endif /* USE_SYSTEM_JPEGLIB */