From 18701a2fcad5171b03a76ceda18702831eb90850 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sun, 20 Apr 2008 20:16:45 +0200
Subject: [PATCH] Added check for Unix specific headers and harmonize with
 Win32 build.

---
 configure.ac         |    1 +
 src/Makefile.am      |    3 ++-
 src/client.c         |    8 ++++----
 src/connection.c     |    8 ++++----
 src/database.c       |    4 ++++
 src/dirent.c         |   16 +++++++++-------
 src/eventl.c         |    6 +++---
 src/http.c           |   11 ++++-------
 src/http_command.c   |   14 +++-----------
 src/logic.c          |    8 ++++----
 src/normalize7bit.c  |    8 ++++----
 src/pazpar2.c        |    1 -
 src/pazpar2_config.c |    8 +++-----
 src/record.c         |    3 ---
 src/relevance.c      |    8 ++++----
 src/settings.c       |    6 +++++-
 src/termlists.c      |    8 ++++----
 src/util.c           |    2 +-
 18 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9c6d987..0bb54cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ if test -z "$YAZLIB"; then
 fi
 YAZ_DOC
 
+AC_CHECK_HEADERS([sys/time.h sys/socket.h unistd.h netinet/in.h netdb.h arpa/inet.h])
 AC_CHECK_FUNCS([getaddrinfo])
 AC_CHECK_ICU([3.6],[ICU_CPPFLAGS="$ICU_CPPFLAGS -D HAVE_ICU=1"])
 AC_CONFIG_FILES([
diff --git a/src/Makefile.am b/src/Makefile.am
index 2148f6d..9195380 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,7 +32,8 @@ libpazpar2_a_SOURCES = pazpar2_config.c pazpar2_config.h eventl.c eventl.h \
 	util.c util.h zeerex.c zeerex.h database.c database.h \
 	settings.h settings.c sel_thread.c sel_thread.h getaddrinfo.c \
 	charsets.c charsets.h \
-	client.c client.h connection.c connection.h host.h parameters.h
+	client.c client.h connection.c connection.h host.h parameters.h \
+	dirent.c direntz.h
 
 pazpar2_SOURCES = pazpar2.c
 pazpar2_LDADD = libpazpar2.a $(YAZLIB) $(ICU_LIBS)
diff --git a/src/client.c b/src/client.c
index 87ef522..076b5e5 100644
--- a/src/client.c
+++ b/src/client.c
@@ -21,6 +21,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     \brief Z39.50 client 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -54,10 +58,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/oid_db.h>
 #include <yaz/diagbib1.h>
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #define USE_TIMING 0
 #if USE_TIMING
 #include <yaz/timing.h>
diff --git a/src/connection.c b/src/connection.c
index 9ea3275..9a152b0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -21,6 +21,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     \brief Z39.50 connection (low-level client)
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -45,10 +49,6 @@ typedef int socklen_t;
 #include <ctype.h>
 #include <assert.h>
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <yaz/log.h>
 #include <yaz/comstack.h>
 #include <yaz/tcpip.h>
diff --git a/src/database.c b/src/database.c
index 347c26b..9069791 100644
--- a/src/database.c
+++ b/src/database.c
@@ -17,6 +17,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxslt/xslt.h>
diff --git a/src/dirent.c b/src/dirent.c
index a0a8a73..6daba7e 100644
--- a/src/dirent.c
+++ b/src/dirent.c
@@ -1,15 +1,12 @@
-/* $Id: dirent.c,v 1.10 2007-01-15 15:10:26 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 Index Data
 
-This file is part of the Zebra server.
-
-Zebra is free software; you can redistribute it and/or modify it under
+Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2, or (at your option) any later
 version.
 
-Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
@@ -21,6 +18,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 
+/* almost identical to dirent.c of Zebra. */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <ctype.h>
 #include <assert.h>
diff --git a/src/eventl.c b/src/eventl.c
index 29a621c..518b69e 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  * Based on revision YAZ' server/eventl.c 1.29.
  */
 
-#include <stdio.h>
-#include <assert.h>
-
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <stdio.h>
+#include <assert.h>
+
 #ifdef WIN32
 #include <winsock.h>
 #else
diff --git a/src/http.c b/src/http.c
index b1d7b43..c68318a 100644
--- a/src/http.c
+++ b/src/http.c
@@ -17,6 +17,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #ifdef WIN32
 #include <winsock.h>
@@ -28,9 +32,6 @@ typedef int socklen_t;
 #endif
 
 #include <sys/types.h>
-#if HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
 
 #include <yaz/snprintf.h>
 #if HAVE_UNISTD_H
@@ -49,10 +50,6 @@ typedef int socklen_t;
 #include <assert.h>
 #include <string.h>
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
diff --git a/src/http_command.c b/src/http_command.c
index 0de007b..bb69bee 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -17,15 +17,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-/*
- * $Id: http_command.c,v 1.66 2007-10-28 18:55:26 adam Exp $
- */
-
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <sys/types.h>
-#if HAVE_SYS_UIO_H
-#include <sys/uio.h>
-#endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -36,10 +32,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <sys/time.h>
 #endif
 #include <yaz/snprintf.h>
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <yaz/yaz-util.h>
 
 #include "util.h"
diff --git a/src/logic.c b/src/logic.c
index 8abdcae..3d4de11 100644
--- a/src/logic.c
+++ b/src/logic.c
@@ -21,6 +21,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     \brief high-level logic; mostly user sessions and settings
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -54,10 +58,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/oid_db.h>
 #include <yaz/snprintf.h>
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #define USE_TIMING 0
 #if USE_TIMING
 #include <yaz/timing.h>
diff --git a/src/normalize7bit.c b/src/normalize7bit.c
index 7642cd7..f400d93 100644
--- a/src/normalize7bit.c
+++ b/src/normalize7bit.c
@@ -21,14 +21,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     \brief char and string normalization for 7bit ascii only
 */
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
 #include "normalize7bit.h"
 
 
diff --git a/src/pazpar2.c b/src/pazpar2.c
index a4be363..dbcf4b8 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -21,7 +21,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <config.h>
 #endif
 
-
 #include <signal.h>
 #include <assert.h>
 
diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 1f1423a..11cc316 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -17,7 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-/* $Id: config.c,v 1.42 2007-10-31 05:29:08 quinn Exp $ */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <string.h>
 
@@ -27,10 +29,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <yaz/yaz-util.h>
 #include <yaz/nmem.h>
 #include <yaz/snprintf.h>
diff --git a/src/record.c b/src/record.c
index 5220abf..b1446ce 100644
--- a/src/record.c
+++ b/src/record.c
@@ -17,9 +17,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-/* $Id: record.c,v 1.10 2007-06-13 21:29:04 adam Exp $ */
-
-
 #include <string.h>
 
 #include <yaz/yaz-util.h>
diff --git a/src/relevance.c b/src/relevance.c
index b35adce..86ba9ec 100644
--- a/src/relevance.c
+++ b/src/relevance.c
@@ -17,14 +17,14 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <ctype.h>
+#include <math.h>
+#include <stdlib.h>
+
 #include "relevance.h"
 #include "pazpar2.h"
 
diff --git a/src/settings.c b/src/settings.c
index 8dbb687..bea5da7 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -17,12 +17,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-
 // This module implements a generic system of settings
 // (attribute-value) that can be associated with search targets. The
 // system supports both default values, per-target overrides, and
 // per-user settings.
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
 #include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/termlists.c b/src/termlists.c
index ad0529c..00247f2 100644
--- a/src/termlists.c
+++ b/src/termlists.c
@@ -17,15 +17,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <yaz/yaz-util.h>
 
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "termlists.h"
 
 // Discussion:
diff --git a/src/util.c b/src/util.c
index 7944d97..353130f 100644
--- a/src/util.c
+++ b/src/util.c
@@ -16,12 +16,12 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
-#include <stdlib.h>
 
 #if HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <stdlib.h>
 #include <yaz/yaz-util.h>
 
 void die(char *string, char *add)
-- 
1.7.10.4