Make csclient.cxx buildable with HAVE_NSS, but not HAVA_AVAHI.

* csclient.cxx: Rejigger conditional includes.

diff --git a/csclient.cxx b/csclient.cxx
index 82eb26b853fe9d30fb31c87c9c4b53453470210f..78d5d6688e913ed7557d7ae273de539aa1f21167 100644 (file)
--- 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