aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/Makefile.am1
-rw-r--r--camel/camel-charset-map.c3
-rw-r--r--camel/camel-operation.c2
4 files changed, 11 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index d7ff60cc16..73cc838bb1 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,11 @@
2001-04-16 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-operation.c: Added a prototype for stamp().
+
+ * camel-charset-map.c (camel_charset_locale_name): #include
+ string.h so we don't get a warning about strchr being undefined
+ and also init charset to NULL.
+
* camel-pgp-context.c (pgp_verify): Go back to doing the utf8
conversion by hand so that we don't depend on gal.
diff --git a/camel/Makefile.am b/camel/Makefile.am
index fd2126ea43..8427492095 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -14,6 +14,7 @@ INCLUDES = -I.. -I$(srcdir)/.. \
$(GLIB_CFLAGS) \
$(GNOME_XML_CFLAGS) \
$(UNICODE_CFLAGS) \
+ $(EXTRA_GNOME_CFLAGS) \
$(KRB4_CFLAGS) \
$(NSPR_CFLAGS) \
$(NSS_CFLAGS) \
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index d5d7665dac..dac774bdf2 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -203,6 +203,7 @@ void main(void)
#include "camel-charset-map-private.h"
#include <unicode.h>
#include <locale.h>
+#include <string.h>
#include <glib.h>
void camel_charset_init(CamelCharset *c)
@@ -286,7 +287,7 @@ camel_charset_best(const char *in, int len)
char *
camel_charset_locale_name (void)
{
- char *locale, *charset;
+ char *locale, *charset = NULL;
locale = setlocale (LC_ALL, NULL);
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index 4433fa5d1a..0b5678d29a 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -62,6 +62,8 @@ static pthread_mutex_t operation_active_lock = PTHREAD_MUTEX_INITIALIZER;
#define CAMEL_ACTIVE_UNLOCK()
#endif
+static unsigned int stamp (void);
+
static GHashTable *operation_active;
typedef struct _CamelOperationMsg {