merge in klp-release history after reset to klp-dev

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

diff --git a/vm/BitVector.h b/vm/BitVector.h
index d1a0ca3..2ac0ddf 100644 (file)
--- a/vm/BitVector.h
+++ b/vm/BitVector.h
@@ -17,8 +17,8 @@
 /*
  * Miscellaneous utility functions.
  */
-#ifndef _DALVIK_BITVECTOR
-#define _DALVIK_BITVECTOR
+#ifndef DALVIK_BITVECTOR_H_
+#define DALVIK_BITVECTOR_H_
 
 /*
  * Expanding bitmap, used for tracking resources.  Bits are numbered starting
@@ -26,18 +26,18 @@
  *
  * All operations on a BitVector are unsynchronized.
  */
-typedef struct BitVector {
+struct BitVector {
     bool    expandable;     /* expand bitmap if we run out? */
     u4      storageSize;    /* current size, in 32-bit words */
     u4*     storage;
-} BitVector;
+};
 
 /* Handy iterator to walk through the bit positions set to 1 */
-typedef struct BitVectorIterator {
+struct BitVectorIterator {
     BitVector *pBits;
     u4 idx;
     u4 bitSize;
-} BitVectorIterator;
+};
 
 /* allocate a bit vector with enough space to hold "startBits" bits */
 BitVector* dvmAllocBitVector(unsigned int startBits, bool expandable);
@@ -100,4 +100,4 @@ void dvmBitVectorIteratorInit(BitVector* pBits, BitVectorIterator* iterator);
 /* Return the next position set to 1. -1 means end-of-vector reached */
 int dvmBitVectorIteratorNext(BitVectorIterator* iterator);
 
-#endif /*_DALVIK_BITVECTOR*/
+#endif  // DALVIK_BITVECTOR_H_