diff mbox

[2/2] pngpriv: protect some #includes from PNG_VERSION_INFO_ONLY

Message ID 1360074071-27671-2-git-send-email-mans.rullgard@linaro.org
State New
Headers show

Commit Message

Mans Rullgard Feb. 5, 2013, 2:21 p.m. UTC 
This is needed for the ARM NEON code to build.
---
 pngpriv.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/pngpriv.h b/pngpriv.h
index ebea8b8..9ebc510 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -194,8 +194,6 @@ 
 #  endif
 #endif
 
-#include "png.h"
-
 /* pngconf.h does not set PNG_DLL_EXPORT unless it is required, so: */
 #ifndef PNG_DLL_EXPORT
 #  define PNG_DLL_EXPORT
@@ -328,6 +326,7 @@ 
 #  define PNGFAPI /* PRIVATE */
 #endif
 
+#ifndef PNG_VERSION_INFO_ONLY
 /* Other defines specific to compilers can go here.  Try to keep
  * them inside an appropriate ifdef/endif pair for portability.
  */
@@ -369,6 +368,7 @@ 
 #    include <m68881.h>
 #  endif
 #endif /* FLOATING_ARITHMETIC || FLOATING_POINT */
+#endif /* VERSION_INFO_ONLY */
 
 /* These macros may need to be architecture dependent. */
 #define PNG_ALIGN_NONE   0 /* do not use data alignment */
@@ -679,6 +679,7 @@ 
  */
 #ifndef PNG_VERSION_INFO_ONLY
 
+#include "png.h"
 #include "pngstruct.h"
 #include "pnginfo.h"