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

src/trusted/gdb_rsp/abi.h

 /*
  * Copyright 2010 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 // This module provides an interface for performing ABI specific
 // functions needed by the Target and Host.  ABI objects are provided
 // to the rest of the system as "const" to prevent accidental modification.
 // None of the resources in the Abi object are actually owned by the Abi
 // object, they are assumed to be static and never destroyed.
 //
 // This module will only throw standard errors
 //    std::bad_alloc - when out of memory
 //    std::out_of_range - when using an out of range regsiter index
 //
 // 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>
 
 #include "native_client/src/trusted/port/std_types.h"
 
 namespace gdb_rsp {
 
 class Abi {
  public:
@@ skipping 71 matching lines @@
  private:
   Abi();
   ~Abi();
   void operator =(const Abi&);
 };
 
 typedef std::map<std::string, Abi*> AbiMap_t;
 
 }  // namespace gdb_rsp
 
-#endif  // NATIVE_CLIENT_GDB_RSP_ABI_H_
+#endif  // SRC_TRUSTED_GDB_RSP_ABI_H_