Skip to content

Commit 8f61571

Browse files
committed
Zlib: Remove extern "C" for declarations in bundled private namespace
1 parent 953a404 commit 8f61571

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

modules/juce_core/zip/zlib/JUCE_CHANGES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@
33
Include guards were added to these files to support multiple inclusion in a
44
unity-style build.
55

6+
# zlib.h
7+
8+
`extern "C"` was removed to avoid symbol collisions when including multiple
9+
copies of zlib in the same project.

modules/juce_core/zip/zlib/zlib.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "zconf.h"
3535

3636
#ifdef __cplusplus
37-
extern "C" {
37+
// extern "C" {
3838
#endif
3939

4040
#define ZLIB_VERSION "1.3.1"
@@ -1932,7 +1932,7 @@ ZEXTERN int ZEXPORTVA gzvprintf(gzFile file,
19321932
#endif
19331933

19341934
#ifdef __cplusplus
1935-
}
1935+
// }
19361936
#endif
19371937

19381938
#endif /* ZLIB_H */

0 commit comments

Comments
 (0)