<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39645 >

 Rest of the errors are caused by some 3rd party files. There should
be better way to ignore these than to pipe through dozens of grep
processes.


 - ML

diff -Nurd -X.diff_ignore freeciv/ai/advdiplomacy.c freeciv/ai/advdiplomacy.c
--- freeciv/ai/advdiplomacy.c	2007-08-14 04:58:02.000000000 +0300
+++ freeciv/ai/advdiplomacy.c	2007-08-31 21:31:08.000000000 +0300
@@ -16,6 +16,7 @@
 #endif
 
 #include <assert.h>
+#include <stdarg.h>
 #include <string.h>
 
 #include "aisupport.h"
diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/choice_dialog.c freeciv/client/gui-gtk-2.0/choice_dialog.c
--- freeciv/client/gui-gtk-2.0/choice_dialog.c	2007-03-05 19:14:31.000000000 +0200
+++ freeciv/client/gui-gtk-2.0/choice_dialog.c	2007-08-31 21:32:07.000000000 +0300
@@ -14,6 +14,8 @@
 #include <config.h>
 #endif
 
+#include <stdarg.h>
+
 #include <gtk/gtk.h>
 
 #include "support.h"
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/gui_string.h freeciv/client/gui-sdl/gui_string.h
--- freeciv/client/gui-sdl/gui_string.h	2007-08-20 01:35:26.000000000 +0300
+++ freeciv/client/gui-sdl/gui_string.h	2007-08-31 21:47:44.000000000 +0300
@@ -19,8 +19,8 @@
     email                : Rafał Bursig <[EMAIL PROTECTED]>
  **********************************************************************/
 
-#ifndef __STRING_H
-#define __STRING_H
+#ifndef FC__GUISTRING_H
+#define FC__GUISTRING_H
 
 #include "SDL.h"
 
@@ -95,4 +95,4 @@
 #define create_str16_from_char(pInCharString, iPtsize) \
         copy_chars_to_string16(create_string16(NULL, 0,iPtsize), pInCharString)
 
-#endif
+#endif /* FC__GUISTRING_H */
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/unistring.h freeciv/client/gui-sdl/unistring.h
--- freeciv/client/gui-sdl/unistring.h	2007-08-20 01:35:25.000000000 +0300
+++ freeciv/client/gui-sdl/unistring.h	2007-08-31 21:48:09.000000000 +0300
@@ -19,8 +19,8 @@
     email                : Rafał Bursig <[EMAIL PROTECTED]>
  **********************************************************************/
 
-#ifndef __UNISTRING_H
-#define __UNISTRING_H
+#ifndef FC__UNISTRING_H
+#define FC__UNISTRING_H
 
 #include "SDL.h"
 
@@ -31,4 +31,4 @@
 Uint16 *unistrdup(const Uint16 *pUniString);
 Uint16 **create_new_line_unistrings(const Uint16 *pUnistring);
 
-#endif /* __UNISTRING_H */
+#endif /* FC__UNISTRING_H */
diff -Nurd -X.diff_ignore freeciv/client/gui-win32/diplodlg.h freeciv/client/gui-win32/diplodlg.h
--- freeciv/client/gui-win32/diplodlg.h	2007-03-05 19:14:32.000000000 +0200
+++ freeciv/client/gui-win32/diplodlg.h	2007-08-31 21:38:18.000000000 +0300
@@ -1,3 +1,16 @@
+/********************************************************************** 
+ Freeciv - Copyright (C) 2001-2007 - The Freeciv Project
+   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.
+***********************************************************************/
+
 /* diplodlg.h -- PLACEHOLDER */
 #ifndef FC__DIPLODLG_H
 #define FC__DIPLODLG_H
diff -Nurd -X.diff_ignore freeciv/client/gui-win32/happiness.h freeciv/client/gui-win32/happiness.h
--- freeciv/client/gui-win32/happiness.h	2007-03-05 19:14:32.000000000 +0200
+++ freeciv/client/gui-win32/happiness.h	2007-08-31 21:38:52.000000000 +0300
@@ -1,3 +1,16 @@
+/********************************************************************** 
+ Freeciv - Copyright (C) 2002-2007 - The Freeciv Project
+   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__HAPPINESS_H
 #define FC__HAPPINESS_H
 
diff -Nurd -X.diff_ignore freeciv/client/reqtree.c freeciv/client/reqtree.c
--- freeciv/client/reqtree.c	2007-08-02 00:56:20.000000000 +0300
+++ freeciv/client/reqtree.c	2007-08-31 21:38:01.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
-   Copyright (C) 2005  The Freeciv Project
+ Freeciv - Copyright (C) 2005-2007 - The Freeciv Project
    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)
diff -Nurd -X.diff_ignore freeciv/client/reqtree.h freeciv/client/reqtree.h
--- freeciv/client/reqtree.h	2007-08-02 00:56:20.000000000 +0300
+++ freeciv/client/reqtree.h	2007-08-31 21:35:59.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
-   Copyright (C) 2005  The Freeciv Project
+ Freeciv - Copyright (C) 2005-2007 - The Freeciv Project
    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)
diff -Nurd -X.diff_ignore freeciv/server/generator/height_map.c freeciv/server/generator/height_map.c
--- freeciv/server/generator/height_map.c	2007-03-05 19:13:43.000000000 +0200
+++ freeciv/server/generator/height_map.c	2007-08-31 21:40:05.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
-   Copyright (C) 1996 - 2004  The Freeciv Project
+ Freeciv - Copyright (C) 1996-2007 - The Freeciv Project
    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)
diff -Nurd -X.diff_ignore freeciv/server/generator/height_map.h freeciv/server/generator/height_map.h
--- freeciv/server/generator/height_map.h	2007-03-05 19:13:43.000000000 +0200
+++ freeciv/server/generator/height_map.h	2007-08-31 21:40:50.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
-   Copyright (C) 1996 - 2004  The Freeciv Project
+ Freeciv - Copyright (C) 1996-2007 - The Freeciv Project
    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)
diff -Nurd -X.diff_ignore freeciv/server/generator/mapgen_topology.c freeciv/server/generator/mapgen_topology.c
--- freeciv/server/generator/mapgen_topology.c	2007-03-05 19:13:43.000000000 +0200
+++ freeciv/server/generator/mapgen_topology.c	2007-08-31 21:43:44.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
-   Copyright (C) 2004 - Marcelo J. Burda,
+ Freeciv - Copyright (C) 2004 - Marcelo J. Burda
    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)
diff -Nurd -X.diff_ignore freeciv/server/generator/temperature_map.c freeciv/server/generator/temperature_map.c
--- freeciv/server/generator/temperature_map.c	2007-03-05 19:13:43.000000000 +0200
+++ freeciv/server/generator/temperature_map.c	2007-08-31 21:43:47.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
-   Copyright (C) 2004 - Marcelo J. Burda
+ Freeciv - Copyright (C) 2004 - Marcelo J. Burda
    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)
diff -Nurd -X.diff_ignore freeciv/server/generator/temperature_map.h freeciv/server/generator/temperature_map.h
--- freeciv/server/generator/temperature_map.h	2007-03-05 19:13:43.000000000 +0200
+++ freeciv/server/generator/temperature_map.h	2007-08-31 21:43:59.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
-   Copyright (C) 2004 - Marcelo J. Burda
+ Freeciv - Copyright (C) 2004 - Marcelo J. Burda
    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)
diff -Nurd -X.diff_ignore freeciv/server/generator/utilities.c freeciv/server/generator/utilities.c
--- freeciv/server/generator/utilities.c	2007-03-05 19:13:43.000000000 +0200
+++ freeciv/server/generator/utilities.c	2007-08-31 21:44:21.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
-   Copyright (C) 2004 - Marcelo J. Burda,
+ Freeciv - Copyright (C) 2004 - Marcelo J. Burda
    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)
diff -Nurd -X.diff_ignore freeciv/server/generator/utilities.h freeciv/server/generator/utilities.h
--- freeciv/server/generator/utilities.h	2007-03-05 19:13:43.000000000 +0200
+++ freeciv/server/generator/utilities.h	2007-08-31 21:44:35.000000000 +0300
@@ -1,5 +1,5 @@
 /********************************************************************** 
- Freeciv Generator - Copyright (C) 2004 - Marcelo J. Burda
+ Freeciv - Copyright (C) 2004 - Marcelo J. Burda
    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)
diff -Nurd -X.diff_ignore freeciv/server/scripting/script_signal.c freeciv/server/scripting/script_signal.c
--- freeciv/server/scripting/script_signal.c	2007-03-12 14:22:57.000000000 +0200
+++ freeciv/server/scripting/script_signal.c	2007-08-31 21:32:32.000000000 +0300
@@ -42,6 +42,7 @@
 #endif
 
 #include <assert.h>
+#include <stdarg.h>
 
 #include "hash.h"
 #include "log.h"
diff -Nurd -X.diff_ignore freeciv/utility/fciconv.c freeciv/utility/fciconv.c
--- freeciv/utility/fciconv.c	2007-03-05 19:13:42.000000000 +0200
+++ freeciv/utility/fciconv.c	2007-08-31 21:32:58.000000000 +0300
@@ -17,6 +17,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to