Kouhei Sutou
kous****@users*****
Mon Mar 19 16:33:22 JST 2007
Index: kazehakase/src/net/kz-http.c
diff -u kazehakase/src/net/kz-http.c:1.87 kazehakase/src/net/kz-http.c:1.88
--- kazehakase/src/net/kz-http.c:1.87 Thu Mar 15 21:33:38 2007
+++ kazehakase/src/net/kz-http.c Mon Mar 19 16:33:22 2007
@@ -21,9 +21,11 @@
*/
#ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
#endif /* HAVE_CONFIG_H */
+#include "gnet.h"
+
#include <stdlib.h>
#include <string.h>
#define __USE_XOPEN
@@ -38,7 +40,6 @@
#endif
#include "kz-http.h"
-#include "gnet.h"
#include "kazehakase.h"
#include "kz-profile.h"
#include "kz-proxy-item.h"
@@ -770,6 +771,13 @@
return iostatus;
}
+static char *
+strptime(const char *s, const char *format, struct tm *tm)
+{
+ return format;
+};
+
+
static GIOStatus
kz_http_in_header (KzHTTP *http, GIOChannel *iochannel)
{
Index: kazehakase/src/net/inetaddr.h
diff -u kazehakase/src/net/inetaddr.h:1.2 kazehakase/src/net/inetaddr.h:1.3
--- kazehakase/src/net/inetaddr.h:1.2 Wed Oct 8 22:25:45 2003
+++ kazehakase/src/net/inetaddr.h Mon Mar 19 16:33:22 2007
@@ -28,8 +28,8 @@
#include <glib.h>
-#ifdef GNET_WIN32
-#include <winsock2.h> /* This needs to be here */
+#ifdef GNET_WIN32
+# include <winsock2.h> /* This needs to be here */
#endif
#ifdef __cplusplus
Index: kazehakase/src/net/gnet.h
diff -u kazehakase/src/net/gnet.h:1.3 kazehakase/src/net/gnet.h:1.4
--- kazehakase/src/net/gnet.h:1.3 Wed Mar 14 11:47:27 2007
+++ kazehakase/src/net/gnet.h Mon Mar 19 16:33:22 2007
@@ -28,10 +28,15 @@
#ifndef _GNET_H
#define _GNET_H
+#ifdef __CYGWIN__
+# define __USE_W32_SOCKETS
+#endif
+
#include <glib.h>
#ifdef G_OS_WIN32
-#define GNET_WIN32
+# define GNET_WIN32
#endif
+
#include "inetaddr.h"
#include "tcp.h"
#include "uri.h"
Index: kazehakase/src/net/gnet-private.h
diff -u kazehakase/src/net/gnet-private.h:1.3 kazehakase/src/net/gnet-private.h:1.4
--- kazehakase/src/net/gnet-private.h:1.3 Thu Mar 15 21:33:38 2007
+++ kazehakase/src/net/gnet-private.h Mon Mar 19 16:33:22 2007
@@ -27,7 +27,11 @@
#ifndef _GNET_PRIVATE_H
#define _GNET_PRIVATE_H
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include "gnet.h"
#include <stdio.h>
#include <stdlib.h>
@@ -43,10 +47,6 @@
#include <sys/param.h>
#endif
-#include <glib.h>
-#include "gnet.h"
-
-
#ifndef GNET_WIN32 /*********** Unix specific ***********/
#ifdef HAVE_UNISTD_H