This change contains changes that were made on a separate copy of this code,...

src/trusted/gdb_rsp/abi.h

Index: src/trusted/gdb_rsp/abi.h
===================================================================
--- src/trusted/gdb_rsp/abi.h	(revision 3879)
+++ src/trusted/gdb_rsp/abi.h	(working copy)
@@ -17,8 +17,8 @@
 // It is required that Init be called prior to calling Find to ensure
 // the various built-in ABIs have been registered.
 
-#ifndef NATIVE_CLIENT_GDB_RSP_ABI_H_
-#define NATIVE_CLIENT_GDB_RSP_ABI_H_ 1
+#ifndef SRC_TRUSTED_GDB_RSP_ABI_H_

[noelallen_use_chromium, 2010/12/07 23:04:44]

While this probably what we SHOULD do, it's inconsistent with what we ACTUALLY
did.  If you grep for #ifndef you will see that "NATIVE_CLIENT_<MODULE>_<NAME>"
or "NATIVE_CLIENT_SRC_<PATH...>_<NAME>" is the norm for src/trusted/*/*.h

[mlinck, 2010/12/10 21:10:27]

Fair enough.  I was just delinting.  reverted.

+#define SRC_TRUSTED_GDB_RSP_ABI_H_ 1
 
 #include <map>
 #include <string>
@@ -110,5 +110,5 @@
 
 }  // namespace gdb_rsp
 
-#endif  // NATIVE_CLIENT_GDB_RSP_ABI_H_
+#endif  // SRC_TRUSTED_GDB_RSP_ABI_H_