From e69df8696969c31ea7035e1e4c6808467ba99fa5 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Fri, 30 Jan 2009 21:13:38 +0000
Subject: [PATCH] small fix for building in VC2003

---
 juce_amalgamated.cpp                                          | 4 +++-
 .../graphics/imaging/image_file_formats/juce_PNGLoader.cpp    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 9fc1a5f21a..41425097aa 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -214012,9 +214012,11 @@ namespace pnglibNamespace
 
 #if JUCE_INCLUDE_PNGLIB_CODE
 
-  using ::calloc;
+ #if _MSC_VER != 1310
+  using ::calloc; // (causes conflict in VS.NET 2003)
   using ::malloc;
   using ::free;
+ #endif
 
   extern "C"
   {
diff --git a/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp b/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp
index 3a026bf46b..6eabeb9ed0 100644
--- a/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp
+++ b/src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp
@@ -54,9 +54,11 @@ namespace pnglibNamespace
 
 #if JUCE_INCLUDE_PNGLIB_CODE
 
-  using ::calloc;
+ #if _MSC_VER != 1310
+  using ::calloc; // (causes conflict in VS.NET 2003)
   using ::malloc;
   using ::free;
+ #endif
 
   extern "C"
   {