From 71e33d7094610f92d48420b2455c170adc50b09a Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 27 Oct 2011 23:21:40 -0400 Subject: [PATCH] Revert of df937f7: it compiles now. Behavior is still off though. --- src/RageSurface_Load_JPEG.cpp | 5 ----- src/RageSurface_Save_JPEG.cpp | 4 ---- 2 files changed, 9 deletions(-) diff --git a/src/RageSurface_Load_JPEG.cpp b/src/RageSurface_Load_JPEG.cpp index 15d8a623a1..4f686fe354 100644 --- a/src/RageSurface_Load_JPEG.cpp +++ b/src/RageSurface_Load_JPEG.cpp @@ -21,13 +21,8 @@ #pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */ #else extern "C" { -#if defined(MACOSX) -#include <../extern/libjpeg/jpeglib.h> -#include <../extern/libjpeg/jerror.h> -#else #include "jpeglib.h" #include "jerror.h" -#endif } #endif diff --git a/src/RageSurface_Save_JPEG.cpp b/src/RageSurface_Save_JPEG.cpp index f0a07e6c86..d9a665b2b9 100644 --- a/src/RageSurface_Save_JPEG.cpp +++ b/src/RageSurface_Save_JPEG.cpp @@ -12,11 +12,7 @@ namespace jpeg { extern "C" { -#if defined(MACOSX) -#include <../extern/libjpeg/jpeglib.h> -#else #include "jpeglib.h" -#endif } }