From 0b5fd389c0435e86a0348860f103be7fa9ea2135 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Tue, 2 Jul 2013 17:29:30 +0100
Subject: [PATCH] Moved png lib C symbols into juce namespace.

---
 modules/juce_graphics/image_formats/pnglib/png.h     | 9 ---------
 modules/juce_graphics/image_formats/pnglib/pngpriv.h | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/modules/juce_graphics/image_formats/pnglib/png.h b/modules/juce_graphics/image_formats/pnglib/png.h
index 3ebb82079e..d447233c02 100644
--- a/modules/juce_graphics/image_formats/pnglib/png.h
+++ b/modules/juce_graphics/image_formats/pnglib/png.h
@@ -467,11 +467,6 @@
 
 #ifndef PNG_VERSION_INFO_ONLY
 
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* Version information for C files, stored in png.c.  This had better match
  * the version above.
  */
@@ -3292,10 +3287,6 @@ PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
   PNG_EXPORT_LAST_ORDINAL(244);
 #endif
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* PNG_VERSION_INFO_ONLY */
 /* Do not put anything past this line */
 #endif /* PNG_H */
diff --git a/modules/juce_graphics/image_formats/pnglib/pngpriv.h b/modules/juce_graphics/image_formats/pnglib/pngpriv.h
index 8078cf1848..a93a877134 100644
--- a/modules/juce_graphics/image_formats/pnglib/pngpriv.h
+++ b/modules/juce_graphics/image_formats/pnglib/pngpriv.h
@@ -720,11 +720,6 @@ PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]);
 #endif /* PNG_SIMPLIFIED_READ/WRITE */
 
 
-/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* Internal functions; these are not exported from a DLL however because they
  * are used within several of the C source files they have to be C extern.
  *
@@ -1905,9 +1900,5 @@ PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr,
 
 //#include "pngdebug.h"
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* PNG_VERSION_INFO_ONLY */
 #endif /* PNGPRIV_H */