[xiph-commits] r12663 - icecast/trunk/timing

[moritz at svn.xiph.org]

Author: moritz
Date: 2007-03-06 05:35:29 -0800 (Tue, 06 Mar 2007)
New Revision: 12663

Modified:
   icecast/trunk/timing/timing.h
Log:
Only define [u]int64_t on Windows if they haven't been defined already (e.g. in
os.h from libshout or stdint.h in case they ever show up there.)

ok msmith


Modified: icecast/trunk/timing/timing.h
===================================================================
--- icecast/trunk/timing/timing.h	2007-03-06 13:25:19 UTC (rev 12662)
+++ icecast/trunk/timing/timing.h	2007-03-06 13:35:29 UTC (rev 12663)
@@ -13,7 +13,7 @@
 #include <stdint.h>
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(int64_t)
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
 #endif