am 813a3a2d: Merge "If dalvik wants ASCII casing, it needs to ask for it."

[android-x86/dalvik.git] / vm / PointerSet.h

diff --git a/vm/PointerSet.h b/vm/PointerSet.h
index 6e43f67..7a1cddf 100644 (file)
--- a/vm/PointerSet.h
+++ b/vm/PointerSet.h
@@ -17,15 +17,10 @@
  * Maintain an expanding set of unique pointer values.  The set is
  * kept in sorted order.
  */
-#ifndef _DALVIK_POINTERSET
-#define _DALVIK_POINTERSET
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef DALVIK_POINTERSET_H_
+#define DALVIK_POINTERSET_H_
 
 struct PointerSet;   /* private */
-typedef struct PointerSet PointerSet;
 
 /*
  * Allocate a new PointerSet.
@@ -96,8 +91,4 @@ void dvmPointerSetIntersect(PointerSet* pSet, const void** ptrArray, int count);
  */
 void dvmPointerSetDump(const PointerSet* pSet);
 
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*_DALVIK_POINTERSET*/
+#endif  // DALVIK_POINTERSET_H_