From ce662b639205655655662448cde4de25df7919b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= <ole.andre.ravnas@tandberg.com>
Date: Mon, 22 Mar 2010 16:15:37 +0100
Subject: [PATCH 01/12] Don't include unistd.h unless available

---
 wocky/wocky-bare-contact.c     |    6 ++++++
 wocky/wocky-connector.c        |    6 ++++++
 wocky/wocky-contact-factory.c  |    6 ++++++
 wocky/wocky-contact.c          |    6 ++++++
 wocky/wocky-openssl.c          |    6 ++++++
 wocky/wocky-porter.c           |    5 +++++
 wocky/wocky-resource-contact.c |    6 ++++++
 wocky/wocky-session.c          |    6 ++++++
 wocky/wocky-xmpp-connection.c  |    5 +++++
 9 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/wocky/wocky-bare-contact.c b/wocky/wocky-bare-contact.c
index d9b6561..1de0d06 100644
--- a/wocky/wocky-bare-contact.c
+++ b/wocky/wocky-bare-contact.c
@@ -28,8 +28,14 @@
  * for altering its details.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+ 
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/wocky/wocky-connector.c b/wocky/wocky-connector.c
index 97b2b0b..2023887 100644
--- a/wocky/wocky-connector.c
+++ b/wocky/wocky-connector.c
@@ -84,8 +84,14 @@
  * </informalexample>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/wocky/wocky-contact-factory.c b/wocky/wocky-contact-factory.c
index 3989301..c24cb13 100644
--- a/wocky/wocky-contact-factory.c
+++ b/wocky/wocky-contact-factory.c
@@ -29,8 +29,14 @@
  * without creating them again.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/wocky/wocky-contact.c b/wocky/wocky-contact.c
index bf4344f..8556bad 100644
--- a/wocky/wocky-contact.c
+++ b/wocky/wocky-contact.c
@@ -26,8 +26,14 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/wocky/wocky-openssl.c b/wocky/wocky-openssl.c
index 6c0e1fc..26ba03c 100644
--- a/wocky/wocky-openssl.c
+++ b/wocky/wocky-openssl.c
@@ -33,6 +33,10 @@
  * debugging output from within wocky-openssl.c as well.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "wocky-tls.h"
 
 #include <openssl/ssl.h>
@@ -58,7 +62,9 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/types.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 enum
 {
diff --git a/wocky/wocky-porter.c b/wocky/wocky-porter.c
index c97d652..0b943b2 100644
--- a/wocky/wocky-porter.c
+++ b/wocky/wocky-porter.c
@@ -28,9 +28,14 @@
  * #WockyXmppConnection.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/wocky/wocky-resource-contact.c b/wocky/wocky-resource-contact.c
index 3449f52..5aaea93 100644
--- a/wocky/wocky-resource-contact.c
+++ b/wocky/wocky-resource-contact.c
@@ -26,8 +26,14 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/wocky/wocky-session.c b/wocky/wocky-session.c
index eb64f9c..a14df97 100644
--- a/wocky/wocky-session.c
+++ b/wocky/wocky-session.c
@@ -26,8 +26,14 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/wocky/wocky-xmpp-connection.c b/wocky/wocky-xmpp-connection.c
index 3ae9521..aa8f214 100644
--- a/wocky/wocky-xmpp-connection.c
+++ b/wocky/wocky-xmpp-connection.c
@@ -26,9 +26,14 @@
  * Sends and receives #WockyXmppStanzas from an underlying GIOStream.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 
-- 
1.6.4.msysgit.0