mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
Zlib: Remove extern "C" for declarations in bundled private namespace
This commit is contained in:
parent
953a404359
commit
8f6157142b
2 changed files with 6 additions and 2 deletions
|
|
@ -3,3 +3,7 @@
|
||||||
Include guards were added to these files to support multiple inclusion in a
|
Include guards were added to these files to support multiple inclusion in a
|
||||||
unity-style build.
|
unity-style build.
|
||||||
|
|
||||||
|
# zlib.h
|
||||||
|
|
||||||
|
`extern "C"` was removed to avoid symbol collisions when including multiple
|
||||||
|
copies of zlib in the same project.
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
#include "zconf.h"
|
#include "zconf.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
// extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ZLIB_VERSION "1.3.1"
|
#define ZLIB_VERSION "1.3.1"
|
||||||
|
|
@ -1932,7 +1932,7 @@ ZEXTERN int ZEXPORTVA gzvprintf(gzFile file,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
// }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* ZLIB_H */
|
#endif /* ZLIB_H */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue