changeset 44:784919bf9c35

Remove hardcoded gcc for platforms that don't use gcc. Fix warning reported by clang, on mysql return value.
author Brian Smith <brian@dbsoft.org>
date Tue, 06 Oct 2020 17:55:20 -0500
parents cf24492b5b5c
children 094b1e39c68b
files minimal/Makefile.in mysql/Makefile.in mysql/mysqlplg.c
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/minimal/Makefile.in	Tue Oct 06 17:22:32 2020 -0500
+++ b/minimal/Makefile.in	Tue Oct 06 17:55:20 2020 -0500
@@ -27,7 +27,7 @@
 #   - Place target in $(DESTDIR) - which has a trailing /
 #   - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
 #
-SYSCONF_LINK_SHLIB	= gcc
+SYSCONF_LINK_SHLIB	= @CC@
 SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
 SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared \
 				     -o $(SYSCONF_LINK_TARGET_SHARED) \
--- a/mysql/Makefile.in	Tue Oct 06 17:22:32 2020 -0500
+++ b/mysql/Makefile.in	Tue Oct 06 17:55:20 2020 -0500
@@ -27,7 +27,7 @@
 #   - Place target in $(DESTDIR) - which has a trailing /
 #   - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
 #
-SYSCONF_LINK_SHLIB	= gcc
+SYSCONF_LINK_SHLIB	= @CC@
 SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
 SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) -shared \
 				     -o $(SYSCONF_LINK_TARGET_SHARED) \
--- a/mysql/mysqlplg.c	Tue Oct 06 17:22:32 2020 -0500
+++ b/mysql/mysqlplg.c	Tue Oct 06 17:55:20 2020 -0500
@@ -170,7 +170,7 @@
 
 int minversion(int major, int minor, int sub)
 {
-	char *version = mysql_get_server_info(&dmail_db);
+	const char *version = mysql_get_server_info(&dmail_db);
 	int smajor, sminor, ssub;
 
 	sscanf(version, "%d.%d.%d", &smajor, &sminor, &ssub);