TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for certain libjpeg versions that override INLINE macro

Browse Source
This commit is contained in:
rdb 2017-06-12 19:46:59 +02:00
parent 88e963b936
commit ca2e96d296
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/pnmimagetypes/pnmFileTypeJPG.h
View File

@ -36,6 +36,10 @@
#include <png.h> #include <png.h>
#endif #endif
// jconfig.h overrides our INLINE definition.
#ifdef __GNUC__
#pragma push_macro("INLINE")
#endif
extern "C" { extern "C" {
#include <stdio.h> // jpeglib requires this to be included first. #include <stdio.h> // jpeglib requires this to be included first.
@ -43,6 +47,11 @@ extern "C" {
#include <setjmp.h> #include <setjmp.h>
} }
// Restore our own INLINE definition.
#ifdef __GNUC__
#pragma pop_macro("INLINE")
#endif
/** /**
* For reading and writing Jpeg files. * For reading and writing Jpeg files.
*/ */

9
panda/src/vision/webcamVideoCursorV4L.h
View File

@ -24,9 +24,18 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#ifdef HAVE_JPEG #ifdef HAVE_JPEG
// jconfig.h overrides our INLINE definition.
#ifdef __GNUC__
#pragma push_macro("INLINE")
#endif
extern "C" { extern "C" {
#include <jpeglib.h> #include <jpeglib.h>
} }
#ifdef __GNUC__
#pragma pop_macro("INLINE")
#endif
#endif #endif
class WebcamVideoV4L; class WebcamVideoV4L;