changeset 237:c8df64f43625

[/trunk] Changeset 250 by mikael * Kill some more warnings + Try to solve strptime prototype declaration warning
author mikael
date Fri, 10 Jun 2005 19:26:34 +0000
parents 72fd1273f2b7
children 8e30b2bb380e
files mcabber/configure.ac mcabber/libjabber/xmltok.c mcabber/src/jabglue.c mcabber/src/jabglue.h
diffstat 4 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/configure.ac	Fri Jun 10 19:03:06 2005 +0000
+++ b/mcabber/configure.ac	Fri Jun 10 19:26:34 2005 +0000
@@ -20,6 +20,10 @@
 AC_CHECK_LIB([ncurses], [initscr])
 AC_CHECK_LIB([panel], [new_panel])
 
+AC_CHECK_DECLS([strptime],,,
+[#define _GNU_SOURCE
+#include <time.h>])
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h termios.h unistd.h ncurses.h panel.h getopt.h])
--- a/mcabber/libjabber/xmltok.c	Fri Jun 10 19:03:06 2005 +0000
+++ b/mcabber/libjabber/xmltok.c	Fri Jun 10 19:26:34 2005 +0000
@@ -1491,7 +1491,7 @@
 	    break;
 	}
     }
-    *encPtr = encodingTable[INIT_ENC_INDEX(enc)];
+    *encPtr = encodingTable[(int)INIT_ENC_INDEX(enc)];
     return XmlTok(*encPtr, state, ptr, end, nextTokPtr);
 }
 
--- a/mcabber/src/jabglue.c	Fri Jun 10 19:03:06 2005 +0000
+++ b/mcabber/src/jabglue.c	Fri Jun 10 19:26:34 2005 +0000
@@ -21,6 +21,7 @@
  * USA
  */
 
+#define _GNU_SOURCE  /* We need glibc for strptime */
 #include "../libjabber/jabber.h"
 #include "jabglue.h"
 #include "roster.h"
--- a/mcabber/src/jabglue.h	Fri Jun 10 19:03:06 2005 +0000
+++ b/mcabber/src/jabglue.h	Fri Jun 10 19:26:34 2005 +0000
@@ -5,6 +5,14 @@
 
 #include "../libjabber/jabber.h"
 
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if ! HAVE_DECL_STRPTIME
+ extern char *strptime ();
+#endif
+
 extern jconn jc;
 
 extern char imstatus2char[];