From: Travis Cross <tc@traviscross.com>
Date: Tue, 26 Jun 2012 19:59:23 +0000 (+0000)
Subject: Fix build of cmockery
X-Git-Tag: v1.3.13~60^2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7fd94a53e8b20266b4fcf89fee5be8e81a5ff4d;p=thirdparty%2Ffreeswitch.git

Fix build of cmockery

cmockery.h was trying to redefine uintptr_t, but this is already
defined in stdint.h.
---

diff --git a/libs/libzrtp/test/cmockery/cmockery.h b/libs/libzrtp/test/cmockery/cmockery.h
index dd156c8692..6810f5b8ff 100644
--- a/libs/libzrtp/test/cmockery/cmockery.h
+++ b/libs/libzrtp/test/cmockery/cmockery.h
@@ -114,9 +114,6 @@ typedef unsigned long uintptr_t;
  * what's the right preprocessor symbol?
 typedef unsigned long long uintptr_t */
 
-/* ILP32 and LP64 platforms */
-typedef unsigned long uintptr_t;
-
 #endif /* _WIN32 */
 #endif /* _UINTPTR_T */