Author: cazfi
Date: Sat Apr 16 07:23:26 2016
New Revision: 32417

URL: http://svn.gna.org/viewcvs/freeciv?rev=32417&view=rev
Log:
Fixed building of mysql backend.

Reported by Jacob Nevins <jtn>

See patch #7084

Added:
    trunk/dependencies/luasql/freeciv_luasql.patch
Modified:
    trunk/dependencies/luasql/Makefile.am
    trunk/dependencies/luasql/Version
    trunk/dependencies/luasql/src/ls_mysql.c

Modified: trunk/dependencies/luasql/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/luasql/Makefile.am?rev=32417&r1=32416&r2=32417&view=diff
==============================================================================
--- trunk/dependencies/luasql/Makefile.am       (original)
+++ trunk/dependencies/luasql/Makefile.am       Sat Apr 16 07:23:26 2016
@@ -4,4 +4,5 @@
 
 EXTRA_DIST = \
                README \
+               freeciv_luasql.patch \
                Version

Modified: trunk/dependencies/luasql/Version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/luasql/Version?rev=32417&r1=32416&r2=32417&view=diff
==============================================================================
--- trunk/dependencies/luasql/Version   (original)
+++ trunk/dependencies/luasql/Version   Sat Apr 16 07:23:26 2016
@@ -4,3 +4,5 @@
 Only the files needed by freeciv are included here, not entire luasql
 source directory hierarchy.
 The ls_*.h files are our own additions to use those backends directly.
+Changes applied to included luasql source files are included in
+freeciv_luasql.patch

Added: trunk/dependencies/luasql/freeciv_luasql.patch
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/luasql/freeciv_luasql.patch?rev=32417&view=auto
==============================================================================
--- trunk/dependencies/luasql/freeciv_luasql.patch      (added)
+++ trunk/dependencies/luasql/freeciv_luasql.patch      Sat Apr 16 07:23:26 2016
@@ -0,0 +1,12 @@
+diff -Nurd luasql/src/ls_mysql.c luasql/src/ls_mysql.c
+--- luasql/src/ls_mysql.c      2016-04-14 06:25:33.675191715 +0300
++++ luasql/src/ls_mysql.c      2016-04-14 06:26:22.555141176 +0300
+@@ -183,7 +183,7 @@
+ /*
+ ** Closes the cursos and nullify all structure fields.
+ */
+-static int cur_nullify (lua_State *L, cur_data *cur) {
++static void cur_nullify (lua_State *L, cur_data *cur) {
+       /* Nullify structure fields. */
+       cur->closed = 1;
+       mysql_free_result(cur->my_res);

Modified: trunk/dependencies/luasql/src/ls_mysql.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/luasql/src/ls_mysql.c?rev=32417&r1=32416&r2=32417&view=diff
==============================================================================
--- trunk/dependencies/luasql/src/ls_mysql.c    (original)
+++ trunk/dependencies/luasql/src/ls_mysql.c    Sat Apr 16 07:23:26 2016
@@ -183,7 +183,7 @@
 /*
 ** Closes the cursos and nullify all structure fields.
 */
-static int cur_nullify (lua_State *L, cur_data *cur) {
+static void cur_nullify (lua_State *L, cur_data *cur) {
        /* Nullify structure fields. */
        cur->closed = 1;
        mysql_free_result(cur->my_res);


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to