diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2016-03-17 11:02:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-17 14:40:24 (GMT) |
| commit | be5a8973c39e13d8978c242936dca63a9a746a57 (patch) | |
| tree | 6dbc135114c5df0e03df464d14f338b0d2b998ff /Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly | |
| parent | bf0712866f3245034f5ee7d5835f5e4ed5f47626 (diff) | |
| download | CMake-be5a8973c39e13d8978c242936dca63a9a746a57.zip CMake-be5a8973c39e13d8978c242936dca63a9a746a57.tar.gz CMake-be5a8973c39e13d8978c242936dca63a9a746a57.tar.bz2 | |
GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022)
Previously we allowed this definition to persist outside our header.
This would cause conflicts across multiple such headers because the name
was always the same. Fix this by avoiding the definition altogether.
Diffstat (limited to 'Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly')
| -rw-r--r-- | Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h | 7 | ||||
| -rw-r--r-- | Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h b/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h index 5681f58..808ff01 100644 --- a/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h +++ b/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libshared_export.h @@ -33,9 +33,10 @@ # define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED #endif -#define DEFINE_NO_DEPRECATED 0 -#if DEFINE_NO_DEPRECATED -# define LIBSHARED_NO_DEPRECATED +#if 0 /* DEFINE_NO_DEPRECATED */ +# ifndef LIBSHARED_NO_DEPRECATED +# define LIBSHARED_NO_DEPRECATED +# endif #endif #endif diff --git a/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h b/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h index fd021e9..4aaa848 100644 --- a/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h +++ b/Tests/Module/GenerateExportHeader/reference/UNIX_DeprecatedOnly/libstatic_export.h @@ -33,9 +33,10 @@ # define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED #endif -#define DEFINE_NO_DEPRECATED 0 -#if DEFINE_NO_DEPRECATED -# define LIBSTATIC_NO_DEPRECATED +#if 0 /* DEFINE_NO_DEPRECATED */ +# ifndef LIBSTATIC_NO_DEPRECATED +# define LIBSTATIC_NO_DEPRECATED +# endif #endif #endif |