[Freeciv-Dev] move common/handchat.h to server?

[David Pfitzner <dwp@xxxxxxxxxxxxxx>]

I think common/handchat.h should be moved to server/.
It just contains a prototype for handle_chat_msg(), which
is implemented in server/handchat.c; there is no other
reference to handle_chat_msg() in common, and although the
client happens to have a function with the same name, the
client function is quite different, and actually has a 
different prototype.  (The client never includes handchat.h,
but has a different prototype elsewhere.)

This patch makes the change (with some minor changes on the way).

-- David

diff -N -u -r --exclude-from exclude freeciv-cvs/common/Makefile.am 
fc-adv/common/Makefile.am
--- freeciv-cvs/common/Makefile.am      Sat May  1 14:02:07 1999
+++ fc-adv/common/Makefile.am   Sat May  1 15:37:19 1999
@@ -17,7 +17,6 @@
                game.h          \
                genlist.c       \
                genlist.h       \
-               handchat.h      \
                log.c           \
                log.h           \
                map.c           \
diff -N -u -r --exclude-from exclude freeciv-cvs/common/Makefile.in 
fc-adv/common/Makefile.in
--- freeciv-cvs/common/Makefile.in      Sat May  1 14:02:07 1999
+++ fc-adv/common/Makefile.in   Sat May  1 15:37:41 1999
@@ -97,7 +97,6 @@
                game.h          \
                genlist.c       \
                genlist.h       \
-               handchat.h      \
                log.c           \
                log.h           \
                map.c           \
diff -N -u -r --exclude-from exclude freeciv-cvs/common/handchat.h 
fc-adv/common/handchat.h
--- freeciv-cvs/common/handchat.h       Fri May  1 13:47:03 1998
+++ fc-adv/common/handchat.h    Thu Jan  1 10:00:00 1970
@@ -1,21 +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 __HANDCHAT_H
-#define __HANDCHAT_H
-
-#include "packets.h"
-
-void handle_chat_msg(struct player *pplayer, 
-                    struct packet_generic_message *packet);
-
-#endif
diff -N -u -r --exclude-from exclude freeciv-cvs/server/Makefile.am 
fc-adv/server/Makefile.am
--- freeciv-cvs/server/Makefile.am      Sat May  1 14:02:07 1999
+++ fc-adv/server/Makefile.am   Sat May  1 15:37:28 1999
@@ -25,6 +25,7 @@
                gotohand.c      \
                gotohand.h      \
                handchat.c      \
+               handchat.h      \
                mapgen.c        \
                mapgen.h        \
                maphand.c       \
diff -N -u -r --exclude-from exclude freeciv-cvs/server/Makefile.in 
fc-adv/server/Makefile.in
--- freeciv-cvs/server/Makefile.in      Sat May  1 14:02:07 1999
+++ fc-adv/server/Makefile.in   Sat May  1 15:37:45 1999
@@ -105,6 +105,7 @@
                gotohand.c      \
                gotohand.h      \
                handchat.c      \
+               handchat.h      \
                mapgen.c        \
                mapgen.h        \
                maphand.c       \
diff -N -u -r --exclude-from exclude freeciv-cvs/server/handchat.c 
fc-adv/server/handchat.c
--- freeciv-cvs/server/handchat.c       Wed Dec 16 22:12:04 1998
+++ fc-adv/server/handchat.c    Sat May  1 15:40:48 1999
@@ -19,6 +19,7 @@
 #include <player.h>
 #include <shared.h>
 
+#include "handchat.h"
 
 /**************************************************************************
 ...
diff -N -u -r --exclude-from exclude freeciv-cvs/server/handchat.h 
fc-adv/server/handchat.h
--- freeciv-cvs/server/handchat.h       Thu Jan  1 10:00:00 1970
+++ fc-adv/server/handchat.h    Sat May  1 15:41:30 1999
@@ -0,0 +1,23 @@
+/********************************************************************** 
+ 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__HANDCHAT_H
+#define FC__HANDCHAT_H
+
+#include "packets.h"
+
+struct player;
+
+void handle_chat_msg(struct player *pplayer, 
+                    struct packet_generic_message *packet);
+
+#endif