Index: tools/debugserver/source/RNBRemote.h
===================================================================
--- tools/debugserver/source/RNBRemote.h	(revision 114955)
+++ tools/debugserver/source/RNBRemote.h	(working copy)
@@ -239,7 +239,7 @@
 
     // gdb can send multiple Z/z packets for the same address and
     // these calls must be ref counted.
-    typedef struct Breakpoint
+    struct Breakpoint
     {
         Breakpoint(nub_break_t breakID) :
             m_breakID(breakID),
Index: tools/debugserver/source/PseudoTerminal.h
===================================================================
--- tools/debugserver/source/PseudoTerminal.h	(revision 114955)
+++ tools/debugserver/source/PseudoTerminal.h	(working copy)
@@ -26,7 +26,7 @@
         invalid_pid = -1
     };
 
-    typedef enum Error
+    enum Error
     {
         success                                     = 0,
         err_posix_openpt_failed                     = -2,
Index: tools/debugserver/source/MacOSX/MachProcess.cpp
===================================================================
--- tools/debugserver/source/MacOSX/MachProcess.cpp	(revision 114955)
+++ tools/debugserver/source/MacOSX/MachProcess.cpp	(working copy)
@@ -130,7 +130,7 @@
     Clear();
     // Set the current PID appropriately
     if (pid == 0)
-        m_pid == ::getpid ();
+        m_pid = ::getpid ();
     else
         m_pid = pid;
     return m_pid;    // Return actualy PID in case a zero pid was passed in
Index: tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h
===================================================================
--- tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h	(revision 114955)
+++ tools/debugserver/source/MacOSX/i386/DNBArchImplI386.h	(working copy)
@@ -38,8 +38,8 @@
     static const DNBRegisterSetInfo *
     GetRegisterSetInfo(nub_size_t *num_reg_sets);
 
-    virtual bool            GetRegisterValue(int set, int reg, DNBRegisterValue *reg);
-    virtual bool            SetRegisterValue(int set, int reg, const DNBRegisterValue *reg);
+    virtual bool            GetRegisterValue(int set, int reg, DNBRegisterValue *value);
+    virtual bool            SetRegisterValue(int set, int reg, const DNBRegisterValue *value);
     virtual nub_size_t      GetRegisterContext (void *buf, nub_size_t buf_len);
     virtual nub_size_t      SetRegisterContext (const void *buf, nub_size_t buf_len);
     virtual kern_return_t   GetRegisterState  (int set, bool force);
Index: tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h
===================================================================
--- tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h	(revision 114955)
+++ tools/debugserver/source/MacOSX/x86_64/DNBArchImplX86_64.h	(working copy)
@@ -38,8 +38,8 @@
     static const DNBRegisterSetInfo *
     GetRegisterSetInfo(nub_size_t *num_reg_sets);
 
-    virtual bool            GetRegisterValue(int set, int reg, DNBRegisterValue *reg);
-    virtual bool            SetRegisterValue(int set, int reg, const DNBRegisterValue *reg);
+    virtual bool            GetRegisterValue(int set, int reg, DNBRegisterValue *value);
+    virtual bool            SetRegisterValue(int set, int reg, const DNBRegisterValue *value);
     virtual nub_size_t      GetRegisterContext (void *buf, nub_size_t buf_len);
     virtual nub_size_t      SetRegisterContext (const void *buf, nub_size_t buf_len);