generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix order of include files in order to avoid re-def.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/85001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@232 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wjia@google.com 2011-07-18 23:28:27 +00:00
parent 7d3a2a3bca
commit fcdaf84d7e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common_video/jpeg/main/source/data_manager.h
View File

@ -17,7 +17,11 @@
#include <stdio.h>
extern "C" {
#if defined(USE_SYSTEM_LIBJPEG)
#include <jpeglib.h>
#else
#include "jpeglib.h"
#endif
}
namespace webrtc

12
src/common_video/jpeg/main/source/jpeg.cc
View File

@ -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