Browse Source

Prevented zlib headers messing-up use of the fdopen() function.

tags/2021-05-28
jules 13 years ago
parent
commit
dbaa9b9cc1
3 changed files with 6 additions and 0 deletions
  1. +4
    -0
      modules/juce_core/native/juce_posix_SharedCode.h
  2. +1
    -0
      modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
  3. +1
    -0
      modules/juce_graphics/image_formats/juce_PNGLoader.cpp

+ 4
- 0
modules/juce_core/native/juce_posix_SharedCode.h View File

@@ -1041,6 +1041,10 @@ public:
{
jassert (dest != nullptr);
#ifdef fdopen
#error // the zlib headers define this function as NULL!
#endif
if (readHandle == 0 && childPID != 0)
readHandle = fdopen (pipeHandle, "r");


+ 1
- 0
modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp View File

@@ -61,6 +61,7 @@ namespace zlibNamespace
#include "zlib/trees.c"
#include "zlib/zutil.c"
#undef Byte
#undef fdopen
#if JUCE_CLANG
#pragma clang diagnostic pop


+ 1
- 0
modules/juce_graphics/image_formats/juce_PNGLoader.cpp View File

@@ -99,6 +99,7 @@ namespace pnglibNamespace
#undef max
#undef min
#undef fdopen
#if JUCE_MSVC
#pragma warning (pop)


Loading…
Cancel
Save