* If hashing a pointer, cast it to a 64 bit number so gcc doesn't warn

* Don't put extra stuff after #endif

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2671 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/runtime/libtrace/tracelib.c b/runtime/libtrace/tracelib.c
index 35c9ccc9ca3e84e83d7b3815468bae345c0272b5..aa4e603c11ceb2f5a5249e3d0d63831764c6e43b 100644 (file)
--- a/runtime/libtrace/tracelib.c
+++ b/runtime/libtrace/tracelib.c
@@ -20,7 +20,7 @@
 
 typedef int64_t Generic;
 typedef uint64_t Index;
-typedef ptrdiff_t Pointer;
+typedef uint64_t Pointer;
 
 /* Index IntegerHashFunc(const Generic value, const Index size) */
 #define IntegerHashFunc(value, size) \
@@ -262,7 +262,6 @@ HashPointerToSeqNum(char* ptr)
 void
 ReleasePointerSeqNum(char* ptr)
 { /* if a sequence number was assigned to this ptr, release it */
-  SequenceNumber seqnum;
   if (SequenceNumberTable != NULL)
     Delete(SequenceNumberTable, ptr);
 }

diff --git a/runtime/libtrace/tracelib.h b/runtime/libtrace/tracelib.h
index 493e703566f574ce296cf4273aa9f1bbbbb596f4..f700a00317e31afede2788ad738c39534b04d770 100644 (file)
--- a/runtime/libtrace/tracelib.h
+++ b/runtime/libtrace/tracelib.h
@@ -37,4 +37,4 @@ extern void           ReleasePointersPopSet();
 
 /*===---------------------------------------------------------------------===*/
 
-#endif _TEST_LIBRARIES_LIBINSTR_TRACELIB_
+#endif