]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Fix build of cmockery
authorTravis Cross <tc@traviscross.com>
Tue, 26 Jun 2012 19:59:23 +0000 (19:59 +0000)
committerTravis Cross <tc@traviscross.com>
Mon, 11 Feb 2013 16:41:55 +0000 (16:41 +0000)
cmockery.h was trying to redefine uintptr_t, but this is already
defined in stdint.h.

libs/libzrtp/test/cmockery/cmockery.h

index dd156c869233cc82c430f1a45c77fa76c7f2e323..6810f5b8ffdfc14b6e4fb984e1a31f9e7560243b 100644 (file)
@@ -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 */