compilation failure with new C/C

define symbols as C/C does to avoid "macro redefined" warnings

Author: vuvova

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