Author: cazfi
Date: Wed May 4 06:30:40 2016
New Revision: 32571
URL: http://svn.gna.org/viewcvs/freeciv?rev=32571&view=rev
Log:
Moved dataio.h to common/networking/
See patch #7180
Added:
trunk/common/networking/dataio.h
- copied unchanged from r32570, trunk/common/dataio.h
Removed:
trunk/common/dataio.h
Modified:
trunk/common/Makefile.am
trunk/common/networking/Makefile.am
Modified: trunk/common/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/Makefile.am?rev=32571&r1=32570&r2=32571&view=diff
==============================================================================
--- trunk/common/Makefile.am (original)
+++ trunk/common/Makefile.am Wed May 4 06:30:40 2016
@@ -37,7 +37,6 @@
combat.h \
culture.c \
culture.h \
- dataio.h \
diptreaty.c \
diptreaty.h \
disaster.c \
Removed: trunk/common/dataio.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio.h?rev=32570&view=auto
==============================================================================
--- trunk/common/dataio.h (original)
+++ trunk/common/dataio.h (removed)
@@ -1,22 +0,0 @@
-/***********************************************************************
- Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-***********************************************************************/
-#ifndef FC__DATAIO_H
-#define FC__DATAIO_H
-
-/* This dataio.h header exist only as a interface to include.
- * Currently all the functionality, including the
- * #include of the dataio_raw.h, if needed, at
- * correct spot. */
-#include "dataio_raw.h"
-
-#endif /* FC__DATAIO_H */
Modified: trunk/common/networking/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/Makefile.am?rev=32571&r1=32570&r2=32571&view=diff
==============================================================================
--- trunk/common/networking/Makefile.am (original)
+++ trunk/common/networking/Makefile.am Wed May 4 06:30:40 2016
@@ -12,6 +12,7 @@
libfcivnetwork_la_SOURCES = \
connection.c \
connection.h \
+ dataio.h \
dataio_json.c \
dataio_json.h \
dataio_raw.c \
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
