Author: cazfi
Date: Mon Jan 26 20:15:29 2015
New Revision: 27858
URL: http://svn.gna.org/viewcvs/freeciv?rev=27858&view=rev
Log:
Fixed references to JSON_CONNECTION to its new name FREECIV_JSON_CONNECTION
See bug #23212
Modified:
branches/S2_6/common/connection.c
Modified: branches/S2_6/common/connection.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.c?rev=27858&r1=27857&r2=27858&view=diff
==============================================================================
--- branches/S2_6/common/connection.c (original)
+++ branches/S2_6/common/connection.c Mon Jan 26 20:15:29 2015
@@ -239,7 +239,7 @@
/**************************************************************************
flush'em
**************************************************************************/
-#ifndef JSON_CONNECTION
+#ifndef FREECIV_JSON_CONNECTION
static void flush_connection_send_buffer_packets(struct connection *pc)
{
if(pc && pc->used && pc->send_buffer->ndata >= MAX_LEN_PACKET) {
@@ -250,7 +250,7 @@
}
}
}
-#endif /* JSON_CONNECTION */
+#endif /* FREECIV_JSON_CONNECTION */
/****************************************************************************
Add data to send to the connection.
@@ -292,7 +292,7 @@
pconn->statistics.bytes_send += len;
-#ifndef JSON_CONNECTION
+#ifndef FREECIV_JSON_CONNECTION
if (0 < pconn->send_buffer->do_buffer_sends) {
flush_connection_send_buffer_packets(pconn);
if (!add_connection_data(pconn, data, len)) {
@@ -302,7 +302,7 @@
}
flush_connection_send_buffer_packets(pconn);
} else
-#endif /* JSON_CONNECTION */
+#endif /* FREECIV_JSON_CONNECTION */
{
flush_connection_send_buffer_all(pconn);
if (!add_connection_data(pconn, data, len)) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
