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

src/trusted/gdb_rsp/session.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 interfaces for writing to and reading from a
 // GDB RSP connection.  The connection uses a generic transport
 // object for sending packets from one endpoint to another.  The session
 // is responsible to delievery including generation of checksums and
 // retransmits and handling timeouts as needed.  See:
 // http:// ftp.gnu.org/old-gnu/Manuals/gdb-5.1.1/html_node/gdb_129.html#SEC134
 //
 // All data is read one character at a time through 'GetChar' which will
 // poll on DataAvail and timeout after one second, allowing the session
 // to handle blocking transports.
 //
 // The session object is not reentrant, and will have unpredictable
 // results if two threads attempt to read from the session at the same
 // time.
 //
 // This module may throw a std::bad_alloc if there is an error while trying
 // to resize the packet.  In addition, the underlying ITransport is free
 // to throw an exception if the connection is lost, which will pass out
 // of any packet send or receive function.
-#ifndef NATIVE_CLIENT_GDB_RSP_SESSION_H_
-#define NATIVE_CLIENT_GDB_RSP_SESSION_H_ 1
+#ifndef SRC_TRUSTED_GDB_RSP_SESSION_H_

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

NATIVE_CLIENT_...

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

Done.

+#define SRC_TRUSTED_GDB_RSP_SESSION_H_ 1
 
 #include <sstream>
 
 #include "native_client/src/trusted/port/std_types.h"
 #include "native_client/src/trusted/port/mutex.h"
 #include "native_client/src/trusted/port/transport.h"
 
 namespace gdb_rsp {
 
 class Packet;
@@ skipping 36 matching lines @@
  protected:
   port::IMutex *mutex_;     // Lock to enforce correct response order.
   port::ITransport *io_;    // Transport object not owned by the Session.
   uint32_t flags_;          // Session flags for Sequence/Ack generation.
   uint8_t seq_;             // Next sequence number to use or -1.
   bool connected_;          // Is the connection still valid.
 };
 
 }  // namespace gdb_rsp
 
-#endif  // NATIVE_CLIENT_GDB_RSP_SESSION_H_
+#endif  // SRC_TRUSTED_GDB_RSP_SESSION_H_