commit 76b6167407c2b6f5d40ad895b2793a6b037f54b2
author Elliott Hughes <enh@google.com> Wed Dec 12 17:47:30 2012 -0800
committer Elliott Hughes <enh@google.com> Wed Dec 12 18:11:44 2012 -0800
tree 5c433a0907ddf401f4078b6703253b1ae75e723e
parent f66330a747eff155eb571b634fc9d901c55a78a7

Move mutex.h into base/mutex.h.

We don't actually need any hackery to get the right mutex.h any
more, but since we planned on having the google3-like stuff
in google3-like locations, this is an easy one to fix.

Change-Id: Ie27464ebbc208a6f4e694a97cf26b1cee0737009

src/base/macros.h

diff --git a/src/base/macros.h b/src/base/macros.h
index d63aed6..52013da 100644
--- a/src/base/macros.h
+++ b/src/base/macros.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ART_SRC_MACROS_H_
-#define ART_SRC_MACROS_H_
+#ifndef ART_SRC_BASE_MACROS_H_
+#define ART_SRC_BASE_MACROS_H_
 
 #include <stddef.h>  // for size_t
 
@@ -186,4 +186,4 @@
 
 #endif // defined(__SUPPORT_TS_ANNOTATION__)
 
-#endif  // ART_SRC_MACROS_H_
+#endif  // ART_SRC_BASE_MACROS_H_