From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Nov 2011 20:12:13 +0000 (-0800)
Subject: Merge git://github.com/JoachimSchipper/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=addfe79024abf29740b3d6b6b88d27469289c2e2;hp=aeb367e0a7bbcb280fef33083ae599602ed91951;p=ext%2Fsubsurface.git

Merge git://github.com/JoachimSchipper/subsurface

* git://github.com/JoachimSchipper/subsurface:
  README spelling, capitalization
---

diff --git a/libdivecomputer.c b/libdivecomputer.c
index b1c86c5..9d4c106 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include <pthread.h>
+#include <unistd.h>
+#include <inttypes.h>
 
 #include "dive.h"
 #include "divelist.h"
@@ -433,8 +435,8 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v
 		break;
 	case DEVICE_EVENT_CLOCK:
 		devdata->clock = *clock;
-		printf("Event: systime=%lld, devtime=%u\n",
-			clock->systime, clock->devtime);
+		printf("Event: systime=%"PRId64", devtime=%u\n",
+			(uint64_t)clock->systime, clock->devtime);
 		break;
 	default:
 		break;
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh
index 79e7ad5..ec1f6cc 100755
--- a/packaging/windows/mingw-make.sh
+++ b/packaging/windows/mingw-make.sh
@@ -6,7 +6,9 @@
 # the paths work for the default mingw32 install on OpenSUSE - adjust as
 # necessary
 
+export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
 make CC=i686-w64-mingw32-gcc \
 	PKGCONFIG=i686-w64-mingw32-pkg-config \
 	PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/i686-w64-mingw32/lib/pkgconfig/ \
+	XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \
 	XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe