From fcdaf84d7e193b45811f9b18022b1ca7cfc376bf Mon Sep 17 00:00:00 2001
From: "wjia@google.com" <wjia@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 18 Jul 2011 23:28:27 +0000
Subject: [PATCH] fix order of include files in order to avoid re-def. Review
 URL: http://webrtc-codereview.appspot.com/85001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@232 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 src/common_video/jpeg/main/source/data_manager.h |  4 ++++
 src/common_video/jpeg/main/source/jpeg.cc        | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/common_video/jpeg/main/source/data_manager.h b/src/common_video/jpeg/main/source/data_manager.h
index 07039f5624..11a7892260 100644
--- a/src/common_video/jpeg/main/source/data_manager.h
+++ b/src/common_video/jpeg/main/source/data_manager.h
@@ -17,7 +17,11 @@
 
 #include <stdio.h>
 extern "C" {
+#if defined(USE_SYSTEM_LIBJPEG)
+#include <jpeglib.h>
+#else
 #include "jpeglib.h"
+#endif
 }
 
 namespace webrtc
diff --git a/src/common_video/jpeg/main/source/jpeg.cc b/src/common_video/jpeg/main/source/jpeg.cc
index ca4ff4c5d4..c3623e44ec 100644
--- a/src/common_video/jpeg/main/source/jpeg.cc
+++ b/src/common_video/jpeg/main/source/jpeg.cc
@@ -13,19 +13,23 @@
  */
 
 
+#if defined(WIN32)
+ #include <basetsd.h>
+#endif
+#include <setjmp.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "vplib.h"
 #include "jpeg.h"
 #include "data_manager.h"
-#if defined(WIN32)
- #include <basetsd.h>
-#endif
 extern "C" {
+#if defined(USE_SYSTEM_LIBJPEG)
+#include <jpeglib.h>
+#else
 #include "jpeglib.h"
+#endif
 }
-#include <setjmp.h>
 
 
 namespace webrtc