diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-10-23 15:44:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-10-23 15:53:41 +0200 |
| commit | e864e6b181f4e85fbd76cb5a0f36d0735a47d7ef (patch) | |
| tree | e9e6fd00bb1e9eb5842b03553c632fe1c9dbefb9 | |
| parent | 4654501e00947422710b949832d1b9ff8a7a40a5 (diff) | |
| download | mariadb-git-e864e6b181f4e85fbd76cb5a0f36d0735a47d7ef.tar.gz | |
compilation failure with new C/C
define symbols as C/C does to avoid "macro redefined" warnings
| -rw-r--r-- | include/mysql_version.h.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index f22e00dabb9..16876dbfedd 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -17,12 +17,15 @@ #define MYSQL_SERVER_SUFFIX_DEF "@MYSQL_SERVER_SUFFIX@" #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ -#define MYSQL_PORT @MYSQL_TCP_PORT@ +#define MARIADB_PORT @MYSQL_TCP_PORT@ #define MYSQL_PORT_DEFAULT @MYSQL_TCP_PORT_DEFAULT@ -#define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@" +#define MARIADB_UNIX_ADDR "@MYSQL_UNIX_ADDR@" #define MYSQL_CONFIG_NAME "my" #define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@" +#define MYSQL_PORT MARIADB_PORT +#define MYSQL_UNIX_ADDR MARIADB_UNIX_ADDR + #ifdef WITH_WSREP #define WSREP_PATCH_VERSION "@WSREP_PATCH_VERSION@" #endif |