Browse Source

small fix for building in VC2003

tags/2021-05-28
jules 16 years ago
parent
commit
e69df86969
2 changed files with 6 additions and 2 deletions
  1. +3
    -1
      juce_amalgamated.cpp
  2. +3
    -1
      src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp

+ 3
- 1
juce_amalgamated.cpp View File

@@ -214012,9 +214012,11 @@ namespace pnglibNamespace


#if JUCE_INCLUDE_PNGLIB_CODE #if JUCE_INCLUDE_PNGLIB_CODE


using ::calloc;
#if _MSC_VER != 1310
using ::calloc; // (causes conflict in VS.NET 2003)
using ::malloc; using ::malloc;
using ::free; using ::free;
#endif


extern "C" extern "C"
{ {


+ 3
- 1
src/juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp View File

@@ -54,9 +54,11 @@ namespace pnglibNamespace
#if JUCE_INCLUDE_PNGLIB_CODE #if JUCE_INCLUDE_PNGLIB_CODE
using ::calloc;
#if _MSC_VER != 1310
using ::calloc; // (causes conflict in VS.NET 2003)
using ::malloc; using ::malloc;
using ::free; using ::free;
#endif
extern "C" extern "C"
{ {


Loading…
Cancel
Save