From: Robin Gareus <robin@gareus.org>
Date: Thu, 19 Apr 2018 13:36:01 +0000 (+0200)
Subject: Fix 32bit builds
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=e1f94bbb4a1c2add7402d806f337d072fe4163e9;p=ardour.git

Fix 32bit builds

Unsigned long is 32bit on 32bit systems, besides sampleoffset and start
variables are signed int64_t.

resulting in a compiler error:
integer constant is too large for 'unsigned long' type.
---

diff --git a/libs/ptformat/ptfformat.cc b/libs/ptformat/ptfformat.cc
index 89f3062da1..6fc4b115e5 100644
--- a/libs/ptformat/ptfformat.cc
+++ b/libs/ptformat/ptfformat.cc
@@ -1760,9 +1760,9 @@ nocustom:
 			j+=startbytes;
 
 			if (offsetbytes == 5)
-				sampleoffset -= 1000000000000ul;
+				sampleoffset -= 1000000000000;
 			if (startbytes == 5)
-				start -= 1000000000000ul;
+				start -= 1000000000000;
 
 			std::string filename = string(name);
 			wav_t f = {
@@ -1873,8 +1873,8 @@ nocustom:
 					}
 					m+=8;
 					findex3 = ptfunxored[m] | (ptfunxored[m+1] << 8);
-					sampleoffset -= 1000000000000ul;
-					start -= 1000000000000ul;
+					sampleoffset -= 1000000000000;
+					start -= 1000000000000;
 
 					/*
 					// Find wav with correct findex
@@ -2031,9 +2031,9 @@ nocustom:
 			j+=startbytes;
 
 			if (offsetbytes == 5)
-				sampleoffset -= 1000000000000ul;
+				sampleoffset -= 1000000000000;
 			if (startbytes == 5)
-				start -= 1000000000000ul;
+				start -= 1000000000000;
 
 			std::string filename = string(name);
 			wav_t f = {