Author: cazfi
Date: Sat Jan 24 11:36:43 2015
New Revision: 27800
URL: http://svn.gna.org/viewcvs/freeciv?rev=27800&view=rev
Log:
Made JSON_CONNECTION available from public freeciv_config.h header, under new
name
FREECIV_JSON_CONNECTION.
See patch #5738
Modified:
branches/S2_6/common/connection.h
branches/S2_6/gen_headers/freeciv_config.h.in
branches/S2_6/m4/web-client.m4
Modified: branches/S2_6/common/connection.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.h?rev=27800&r1=27799&r2=27800&view=diff
==============================================================================
--- branches/S2_6/common/connection.h (original)
+++ branches/S2_6/common/connection.h Sat Jan 24 11:36:43 2015
@@ -26,13 +26,13 @@
#include <sys/time.h>
#endif
-#ifdef JSON_CONNECTION
+#ifdef FREECIV_JSON_CONNECTION
#include <jansson.h>
-#endif /* JSON_CONNECTION */
-
-#ifndef JSON_CONNECTION
+#endif /* FREECIV_JSON_CONNECTION */
+
+#ifndef FREECIV_JSON_CONNECTION
#define USE_COMPRESSION
-#endif /* JSON_CONNECTION */
+#endif /* FREECIV_JSON_CONNECTION */
/**************************************************************************
The connection struct and related stuff.
@@ -157,9 +157,9 @@
struct socket_packet_buffer *buffer;
struct socket_packet_buffer *send_buffer;
struct timer *last_write;
-#ifdef JSON_CONNECTION
+#ifdef FREECIV_JSON_CONNECTION
json_t *json_packet;
-#endif /* JSON_CONNECTION */
+#endif /* FREECIV_JSON_CONNECTION */
double ping_time;
Modified: branches/S2_6/gen_headers/freeciv_config.h.in
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/gen_headers/freeciv_config.h.in?rev=27800&r1=27799&r2=27800&view=diff
==============================================================================
--- branches/S2_6/gen_headers/freeciv_config.h.in (original)
+++ branches/S2_6/gen_headers/freeciv_config.h.in Sat Jan 24 11:36:43 2015
@@ -41,4 +41,7 @@
/* libintl.h available */
#undef FREECIV_HAVE_LIBINTL_H
+/* jansson network protocol in use */
+#undef FREECIV_JSON_CONNECTION
+
#endif /* FC__FREECIV_CONFIG_H */
Modified: branches/S2_6/m4/web-client.m4
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/web-client.m4?rev=27800&r1=27799&r2=27800&view=diff
==============================================================================
--- branches/S2_6/m4/web-client.m4 (original)
+++ branches/S2_6/m4/web-client.m4 Sat Jan 24 11:36:43 2015
@@ -14,6 +14,6 @@
AC_CHECK_HEADER([jansson.h], [],
[AC_MSG_ERROR([libjansson found but not jansson.h])])
- AC_DEFINE([JSON_CONNECTION], [1], [jansson network protocol in use])
+ AC_DEFINE([FREECIV_JSON_CONNECTION], [1], [jansson network protocol in
use])
fi
])
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
