diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 89734dc1a5..91810240ea 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -97868,7 +97868,6 @@ void zcfree (voidpf opaque, voidpf ptr) /********* End of inlined file: zutil.c *********/ #undef Byte - #undef Bytef } } diff --git a/juce_amalgamated.h b/juce_amalgamated.h index 6080a58bad..0f22a12f33 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -7480,10 +7480,6 @@ public: */ static bool isOperatingSystem64Bit() throw(); - /** Returns a country code based on the current locale of the OS. - */ - static const String getCountryCode(); - // CPU and memory information.. /** Returns the approximate CPU speed. diff --git a/src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp b/src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp index a8af5c14f6..2ca3f59633 100644 --- a/src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp +++ b/src/juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp @@ -67,7 +67,6 @@ namespace zlibNamespace #include "zlib/uncompr.c" #include "zlib/zutil.c" #undef Byte - #undef Bytef } }