diff options
author | Brian Carlstrom <bdc@google.com> | 2013-07-17 14:40:12 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2013-07-17 16:49:05 -0700 |
commit | fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d (patch) | |
tree | 5fc7f5b941724a62f8e3411df09fae431ff5e3cf /runtime/jdwp | |
parent | 56d947fbc9bc2992e2f93112fafb73e50d2aaa7a (diff) | |
download | art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.zip art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.tar.gz art-fc0e3219edc9a5bf81b166e82fd5db2796eb6a0d.tar.bz2 |
Fix multiple inclusion guards to match new pathnames
Change-Id: Id7735be1d75bc315733b1773fba45c1deb8ace43
Diffstat (limited to 'runtime/jdwp')
-rw-r--r-- | runtime/jdwp/jdwp.h | 6 | ||||
-rw-r--r-- | runtime/jdwp/jdwp_bits.h | 6 | ||||
-rw-r--r-- | runtime/jdwp/jdwp_constants.h | 6 | ||||
-rw-r--r-- | runtime/jdwp/jdwp_event.h | 6 | ||||
-rw-r--r-- | runtime/jdwp/jdwp_expand_buf.h | 6 | ||||
-rw-r--r-- | runtime/jdwp/jdwp_priv.h | 6 | ||||
-rw-r--r-- | runtime/jdwp/object_registry.h | 5 |
7 files changed, 23 insertions, 18 deletions
diff --git a/runtime/jdwp/jdwp.h b/runtime/jdwp/jdwp.h index 436525c..6a5d0d1 100644 --- a/runtime/jdwp/jdwp.h +++ b/runtime/jdwp/jdwp.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_JDWP_JDWP_H_ -#define ART_JDWP_JDWP_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_H_ +#define ART_RUNTIME_JDWP_JDWP_H_ #include "base/mutex.h" #include "jdwp/jdwp_bits.h" @@ -429,4 +429,4 @@ class Request { } // namespace art -#endif // ART_JDWP_JDWP_H_ +#endif // ART_RUNTIME_JDWP_JDWP_H_ diff --git a/runtime/jdwp/jdwp_bits.h b/runtime/jdwp/jdwp_bits.h index 2a3c775..9f80cbe 100644 --- a/runtime/jdwp/jdwp_bits.h +++ b/runtime/jdwp/jdwp_bits.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_JDWP_BITS_H_ -#define ART_JDWP_BITS_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_BITS_H_ +#define ART_RUNTIME_JDWP_JDWP_BITS_H_ #include <stddef.h> #include <stdint.h> @@ -121,4 +121,4 @@ static inline void Write8BE(uint8_t** dst, uint64_t value) { } // namespace art -#endif // ART_JDWP_BITS_H_ +#endif // ART_RUNTIME_JDWP_JDWP_BITS_H_ diff --git a/runtime/jdwp/jdwp_constants.h b/runtime/jdwp/jdwp_constants.h index ebc575b..a8db325 100644 --- a/runtime/jdwp/jdwp_constants.h +++ b/runtime/jdwp/jdwp_constants.h @@ -16,8 +16,8 @@ /* * These come out of the JDWP documentation. */ -#ifndef ART_JDWP_JDWPCONSTANTS_H_ -#define ART_JDWP_JDWPCONSTANTS_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ +#define ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ #include <iosfwd> @@ -246,4 +246,4 @@ std::ostream& operator<<(std::ostream& os, const JdwpTag& value); } // namespace art -#endif // ART_JDWP_JDWPCONSTANTS_H_ +#endif // ART_RUNTIME_JDWP_JDWP_CONSTANTS_H_ diff --git a/runtime/jdwp/jdwp_event.h b/runtime/jdwp/jdwp_event.h index a6eabb1..d269761 100644 --- a/runtime/jdwp/jdwp_event.h +++ b/runtime/jdwp/jdwp_event.h @@ -16,8 +16,8 @@ /* * Handle registration of events, and debugger event notification. */ -#ifndef ART_JDWP_JDWPEVENT_H_ -#define ART_JDWP_JDWPEVENT_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_EVENT_H_ +#define ART_RUNTIME_JDWP_JDWP_EVENT_H_ #include "jdwp/jdwp.h" #include "jdwp/jdwp_constants.h" @@ -110,4 +110,4 @@ void EventFree(JdwpEvent* pEvent); } // namespace art -#endif // ART_JDWP_JDWPEVENT_H_ +#endif // ART_RUNTIME_JDWP_JDWP_EVENT_H_ diff --git a/runtime/jdwp/jdwp_expand_buf.h b/runtime/jdwp/jdwp_expand_buf.h index 820f62d..81e01e2 100644 --- a/runtime/jdwp/jdwp_expand_buf.h +++ b/runtime/jdwp/jdwp_expand_buf.h @@ -16,8 +16,8 @@ /* * Expanding byte buffer, with primitives for appending basic data types. */ -#ifndef ART_JDWP_EXPANDBUF_H_ -#define ART_JDWP_EXPANDBUF_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ +#define ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ #include <string> @@ -67,4 +67,4 @@ void expandBufAddLocation(ExpandBuf* pReply, const JdwpLocation& location); } // namespace art -#endif // ART_JDWP_EXPANDBUF_H_ +#endif // ART_RUNTIME_JDWP_JDWP_EXPAND_BUF_H_ diff --git a/runtime/jdwp/jdwp_priv.h b/runtime/jdwp/jdwp_priv.h index c8a7b26..ab89339 100644 --- a/runtime/jdwp/jdwp_priv.h +++ b/runtime/jdwp/jdwp_priv.h @@ -16,8 +16,8 @@ /* * JDWP internal interfaces. */ -#ifndef ART_JDWP_JDWPPRIV_H_ -#define ART_JDWP_JDWPPRIV_H_ +#ifndef ART_RUNTIME_JDWP_JDWP_PRIV_H_ +#define ART_RUNTIME_JDWP_JDWP_PRIV_H_ #include "debugger.h" #include "jdwp/jdwp.h" @@ -101,4 +101,4 @@ class JdwpNetStateBase { } // namespace art -#endif // ART_JDWP_JDWPPRIV_H_ +#endif // ART_RUNTIME_JDWP_JDWP_PRIV_H_ diff --git a/runtime/jdwp/object_registry.h b/runtime/jdwp/object_registry.h index d0ea59d..345f0ad 100644 --- a/runtime/jdwp/object_registry.h +++ b/runtime/jdwp/object_registry.h @@ -14,6 +14,9 @@ * limitations under the License. */ +#ifndef ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ +#define ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ + #include <stdint.h> #include <map> @@ -98,3 +101,5 @@ class ObjectRegistry { }; } // namespace art + +#endif // ART_RUNTIME_JDWP_OBJECT_REGISTRY_H_ |