From: Dennis Schafroth <dennis@indexdata.com>
Date: Tue, 8 Nov 2011 14:05:01 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
X-Git-Tag: mobile-beta-1~11
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=275d917ce676df4f41fa9fe097154fc5528615a2;hp=4bfb2eb1716921b77ba9715c6abe23ca8097f970;p=pazpar2-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
---

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 585c0f8..cb0d162 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 #ifdef WIN32
 #include <winsock.h>
+#include <direct.h>
 #endif
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -157,7 +158,13 @@ static int sc_main(
             show_version();
             break;
         case 'w':
-            if (chdir(arg))
+            if (
+#ifdef WIN32
+              _chdir
+#else
+              chdir
+#endif
+                (arg)) 
             {
                 yaz_log(YLOG_FATAL|YLOG_ERRNO, "chdir %s", arg);
                 return 1;