# 
# 
# patch "ChangeLog"
#  from [acdacdfcdef2fdbfd97f084f021386acfcd6d284]
#    to [3f9ea8c7b11c854ecfaff9576d9a9908a4abce5c]
# 
# patch "idna/nfkc.c"
#  from [7a4dc987b38a65f2acbc5b6ff8d39834241dbc3d]
#    to [2e2528f92fab6314dbd0e0b03697de038f6fc2ad]
# 
# patch "popt/popt.c"
#  from [6ef9ed02743cd8a39e799aaa5ad77ba9ad1fd227]
#    to [c5276294f1ff0c4782b907df8f72054ea1deac4a]
# 
# patch "popt/popt.h"
#  from [091692391fd1c539b19298f30e8ae074e3210459]
#    to [7580a978e24c88ffde0facd2f67464189bd2c5b3]
# 
# patch "popt/popthelp.c"
#  from [dd354be6b7c17869c9f2092cad22898065435d15]
#    to [9ed9b898e26cf47b1494bde027404773fd3b79f6]
# 
============================================================
--- ChangeLog	acdacdfcdef2fdbfd97f084f021386acfcd6d284
+++ ChangeLog	3f9ea8c7b11c854ecfaff9576d9a9908a4abce5c
@@ -1,3 +1,8 @@
+2006-03-27  Matthew Gregan  <address@hidden>
+
+	* idna/nfkc.c, popt/popt.c, popt/popt.h, popt/popthelp.c: Warning
+	cleanups.
+
 2006-03-25  Matthew Gregan  <address@hidden>
 
 	* diff_patch.cc, hash_map.hh, lua/lua.h, mkstemp.cc, monotone.cc,
============================================================
--- idna/nfkc.c	7a4dc987b38a65f2acbc5b6ff8d39834241dbc3d
+++ idna/nfkc.c	2e2528f92fab6314dbd0e0b03697de038f6fc2ad
@@ -51,7 +51,7 @@
 #define g_malloc malloc
 #define g_free free
 #define GError void
-#define g_set_error(a,b,c,d) 0
+#define g_set_error(a,b,c,d) /* */
 #define g_new(struct_type, n_structs)                                   \
   ((struct_type *) g_malloc (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
 #  if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
============================================================
--- popt/popt.c	6ef9ed02743cd8a39e799aaa5ad77ba9ad1fd227
+++ popt/popt.c	c5276294f1ff0c4782b907df8f72054ea1deac4a
@@ -1180,7 +1180,7 @@
     /address@hidden@*/
 }
 
-const char *const poptStrerror(const int error)
+const char * poptStrerror(const int error)
 {
     switch (error) {
       case POPT_ERROR_NOARG:
============================================================
--- popt/popt.h	091692391fd1c539b19298f30e8ae074e3210459
+++ popt/popt.h	7580a978e24c88ffde0facd2f67464189bd2c5b3
@@ -440,7 +440,7 @@
  * @return		error string
  */
 /address@hidden@*/
-/address@hidden@*/ const char *const poptStrerror(const int error)
+/address@hidden@*/ const char * poptStrerror(const int error)
 	/address@hidden/;
 /address@hidden@*/
 
============================================================
--- popt/popthelp.c	dd354be6b7c17869c9f2092cad22898065435d15
+++ popt/popthelp.c	9ed9b898e26cf47b1494bde027404773fd3b79f6
@@ -67,7 +67,7 @@
 /**
  * @param table		option(s)
  */
-/address@hidden@*/ /address@hidden@*/ static const char *const
+/address@hidden@*/ /address@hidden@*/ static const char *
 getTableTranslationDomain(/address@hidden@*/ const struct poptOption *table)
 	/address@hidden/
 {
@@ -85,7 +85,7 @@
  * @param opt		option(s)
  * @param translation_domain	translation domain
  */
-/address@hidden@*/ /address@hidden@*/ static const char *const
+/address@hidden@*/ /address@hidden@*/ static const char *
 getArgDescrip(const struct poptOption * opt,
 		/address@hidden@*/ /* FIX: i18n macros disabled with lclint */
 		/address@hidden@*/ const char * translation_domain)