From d1f029615d8594966c0fd440b2d088739588d0f7 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Thu, 5 Nov 2015 19:49:07 +0100
Subject: Fix conflicting type error

---
 source/globals.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/globals.c b/source/globals.c
index d7fa677..9b9309e 100644
--- a/source/globals.c
+++ b/source/globals.c
@@ -179,7 +179,7 @@ int DummyEchoBuffer [SOUND_BUFFER_SIZE];
 int MixBuffer [SOUND_BUFFER_SIZE];
 int EchoBuffer [SOUND_BUFFER_SIZE];
 int FilterTaps [8];
-unsigned long Z = 0;
+uint32_t Z = 0;
 int Loop [16];
 #endif
 uint16_t SignExtend [2] =
-- 
cgit v1.2.3