From 3eee08791993a78400a8f819338f34ffdc5cb040 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Tue, 29 Jun 2010 23:35:55 +0200
Subject: [PATCH] Make csclient.cxx buildable with HAVE_NSS, but not
 HAVA_AVAHI.

* csclient.cxx: Rejigger conditional includes.
---
 csclient.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/csclient.cxx b/csclient.cxx
index 82eb26b85..78d5d6688 100644
--- a/csclient.cxx
+++ b/csclient.cxx
@@ -20,6 +20,7 @@
 #include <cassert>
 
 extern "C" {
+#include <sys/time.h>
 #include <glob.h>
 }
 
@@ -32,8 +33,11 @@ extern "C" {
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
 #include <avahi-common/timeval.h>
+}
+#endif
 
 #if HAVE_NSS
+extern "C" {
 #include <ssl.h>
 #include <nspr.h>
 #include <nss.h>
@@ -43,9 +47,6 @@ extern "C" {
 #include <sslerr.h>
 
 #include "nsscommon.h"
-#endif
-
-#include <glob.h>
 }
 #endif
 
-- 
2.43.5