From 372bff1c07dba7afba815a8b47ce47682b9413f8 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 29 Feb 2012 15:07:31 -0500
Subject: [PATCH] Make event_rpcgen.py output conform to indentifier
 conventions

---
 event_rpcgen.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/event_rpcgen.py b/event_rpcgen.py
index e051aa9d..42eded31 100755
--- a/event_rpcgen.py
+++ b/event_rpcgen.py
@@ -1532,7 +1532,7 @@ class CCodeGenerator:
         # Use the complete provided path to the input file, with all
         # non-identifier characters replaced with underscores, to
         # reduce the chance of a collision between guard macros.
-        return '_' + nonident.sub('_', name).upper() + '_'
+        return 'EVENT_RPCOUT_' + nonident.sub('_', name).upper() + '_'
 
     def HeaderPreamble(self, name):
         guard = self.GuardName(name)
@@ -1579,8 +1579,8 @@ class CCodeGenerator:
                  '#include <event2/event.h>\n'
                  '#include <event2/buffer.h>\n'
                  '#include <event2/tag.h>\n\n'
-                 '#ifdef _EVENT___func__\n'
-                 '#define __func__ _EVENT___func__\n'
+                 '#ifdef EVENT____func__\n'
+                 '#define __func__ EVENT____func__\n'
                  '#endif\n\n'
                  )