[vlc-commits] include: wrap more compat functions in extern C block

Marvin Scholz git at videolan.org
Fri Sep 25 06:27:19 CEST 2020


vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Wed Jul 29 13:20:36 2020 +0200| [75b66193fb61390475ad3caf7ed5de7af7fe1658] | committer: Felix Paul Kühne

include: wrap more compat functions in extern C block

This ensures they have the correct linkage declared.

(cherry picked from commit 0e3775e3ff4ed4f1336fb353e1d6614758429d6f)
Signed-off-by: Felix Paul Kühne <felix at feepk.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=75b66193fb61390475ad3caf7ed5de7af7fe1658
---

 include/vlc_fixups.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 9b9d0087fe..a83d0689a3 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -297,6 +297,10 @@ static inline char *getenv (const char *name)
 }
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef HAVE_SETENV
 int setenv (const char *, const char *, int);
 int unsetenv (const char *);
@@ -306,6 +310,10 @@ int unsetenv (const char *);
 void *aligned_alloc(size_t, size_t);
 #endif
 
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
 #if defined (_WIN32) && defined(__MINGW32__)
 #define aligned_free(ptr)  __mingw_aligned_free(ptr)
 #elif defined (_WIN32) && defined(_MSC_VER)



More information about the vlc-commits mailing list