# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1082500805 0
# Node ID 8b935eddeb100f3c42e943fc7219f22f86c8fa7b
# Parent  7024b91453579099b7c42ab55af113c9ec7c9224
[gaim-migrate @ 9485]
Solaris iconv-related buildage fixes from Etan.  He has a great name.  In
fact, the anglicanized version of his name may be the coolest name I can
think of.  Seriously.

committer: Tailor Script <tailor@pidgin.im>

diff -r 7024b9145357 -r 8b935eddeb10 src/gaim-remote.c
--- a/src/gaim-remote.c	Tue Apr 20 20:31:11 2004 +0000
+++ b/src/gaim-remote.c	Tue Apr 20 22:40:05 2004 +0000
@@ -24,7 +24,6 @@
 #include "internal.h"
 
 #include <getopt.h>
-#include <locale.h>
 
 #include <gaim-remote/remote.h>
 
diff -r 7024b9145357 -r 8b935eddeb10 src/gtkconv.c
--- a/src/gtkconv.c	Tue Apr 20 20:31:11 2004 +0000
+++ b/src/gtkconv.c	Tue Apr 20 22:40:05 2004 +0000
@@ -35,7 +35,6 @@
 #endif
 
 #include <gdk/gdkkeysyms.h>
-#include <locale.h>
 
 #include "debug.h"
 #include "imgstore.h"
diff -r 7024b9145357 -r 8b935eddeb10 src/internal.h
--- a/src/internal.h	Tue Apr 20 20:31:11 2004 +0000
+++ b/src/internal.h	Tue Apr 20 22:40:05 2004 +0000
@@ -38,6 +38,7 @@
 #    define N_(String) (String)
 #  endif
 #else
+#  include <locale.h>
 #  define N_(String) (String)
 #  define _(x) (x)
 #  define ngettext(Singular, Plural, Number) ((Number == 1) ? (Singular) : (Plural))
diff -r 7024b9145357 -r 8b935eddeb10 src/main.c
--- a/src/main.c	Tue Apr 20 20:31:11 2004 +0000
+++ b/src/main.c	Tue Apr 20 22:40:05 2004 +0000
@@ -62,7 +62,6 @@
 # include <signal.h>
 #endif
 
-#include "locale.h"
 #include <getopt.h>
 
 #ifdef HAVE_STARTUP_NOTIFICATION