Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
7e388405 by Steve Lhomme at 2023-01-23T07:27:12+00:00
meson: remove unneeded windows defines
They are used to enable _USE_MATH_DEFINES or __USE_MINGW_ANSI_STDIO, which we
already define.
- - - - -
d7a9bc23 by Steve Lhomme at 2023-01-23T07:27:12+00:00
meson: remove _ISOCXX_SOURCE macros on Windows
With a proper C11 compiler we don't need this. Either they activate C11
things in the compiler which should be there anyway. Or in the SDK
which is __USE_MINGW_ANSI_STDIO for C99 and nothing else.
- - - - -
3 changed files:
- config.h.meson
- configure.ac
- meson.build
Changes:
=====================================
config.h.meson
=====================================
@@ -18,9 +18,6 @@
/* Define if the zvbi module is built */
// #undef ZVBI_COMPILED
-/* ISO C, POSIX, and 4.3BSD things. */
-#mesondefine _BSD_SOURCE
-
/* Define to 64 for large files support. */
#mesondefine _FILE_OFFSET_BITS
@@ -45,30 +42,12 @@
/* Define for Windows 7 APIs. */
#mesondefine _WIN32_WINNT
-/* Extensions to ISO C89 from ISO C99. */
-#mesondefine _ISOC99_SOURCE
-
-/* Extensions to ISO C99 from ISO C11. */
-#mesondefine _ISOC11_SOURCE
-
/* IEEE Std 1003.1. */
#mesondefine _POSIX_SOURCE
/* IEEE Std 1003.1. */
#mesondefine _POSIX_C_SOURCE
-/* POSIX and XPG 7th edition */
-#mesondefine _XOPEN_SOURCE
-
-/* TODO: Still needed? XPG things and X/Open Unix extensions. */
-#mesondefine _XOPEN_SOURCE_EXTENDED
-
-/* ISO C, POSIX, and 4.3BSD things. */
-#mesondefine _BSD_SOURCE
-
-/* ISO C, POSIX, and SVID things. */
-#mesondefine _SVID_SOURCE
-
/* Define to 1 to force use of MinGW provided C99 *printf over msvcrt */
#mesondefine __USE_MINGW_ANSI_STDIO
=====================================
configure.ac
=====================================
@@ -293,14 +293,8 @@ int foo() { return my_array[0]; }
])
AC_DEFINE([WIN32_LEAN_AND_MEAN],, [Define to limit the scope of
<windows.h>.])
AC_DEFINE([UNICODE], [1], [Define to 1 for Unicode (Wide Chars) APIs.])
- AC_DEFINE([_ISOC99_SOURCE], [1], [Extensions to ISO C89 from ISO C99.])
- AC_DEFINE([_ISOC11_SOURCE], [1], [Extensions to ISO C99 from ISO C11.])
AC_DEFINE([_POSIX_SOURCE], [1], [IEEE Std 1003.1.])
AC_DEFINE([_POSIX_C_SOURCE], [200809L], [IEEE Std 1003.1.])
- AC_DEFINE([_XOPEN_SOURCE], [700], [POSIX and XPG 7th edition])
- AC_DEFINE([_XOPEN_SOURCE_EXTENDED], [1], [XPG things and X/Open Unix
extensions.])
- AC_DEFINE([_BSD_SOURCE], [1], [ISO C, POSIX, and 4.3BSD things.])
- AC_DEFINE([_SVID_SOURCE], [1], [ISO C, POSIX, and SVID things.])
AC_ARG_WITH(packagedir,
AS_HELP_STRING([--with-packagedir=DIR],
=====================================
meson.build
=====================================
@@ -343,14 +343,8 @@ windows_version_test = '''
mingw_defines = [
['__USE_MINGW_ANSI_STDIO', 1], # Define to force use of MinGW
printf
- ['_ISOC99_SOURCE', 1], # Extensions to ISO C89 from
ISO C99
- ['_ISOC11_SOURCE', 1], # Extensions to ISO C99 from
ISO C11
['_POSIX_SOURCE', 1], # IEEE Std 1003.1
['_POSIX_C_SOURCE', '200809L'], #IEEE Std 1003.1
- ['_XOPEN_SOURCE', 700], # POSIX and XPG 7th edition
- ['_XOPEN_SOURCE_EXTENDED', 1], # XPG things and X/Open Unix
extensions
- ['_BSD_SOURCE', 1], # ISO C, POSIX, and 4.3BSD
things
- ['_SVID_SOURCE', 1], # ISO C, POSIX, and SVID things
]
foreach d : mingw_defines
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/782bf9ad5aff54c987ae15caf6bd6dd371230920...d7a9bc23261abb69d80893abf57d58b035ccf654
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/782bf9ad5aff54c987ae15caf6bd6dd371230920...d7a9bc23261abb69d80893abf57d58b035ccf654
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
