From 0925be2387ceb5c43ddb103d0e604d6864f4f7d9 Mon Sep 17 00:00:00 2001 From: Joe Shaw Date: Wed, 17 Dec 2003 15:27:34 +0000 Subject: [PATCH] 2003-12-16 Joe Shaw * generator/SymbolTable.cs (MangleName): Add "lock" and "callback" to the list of names that need to be mangled. The former is a C# reserved keyword and the latter is already used as an argument to methods which marshal callbacks. svn path=/trunk/gtk-sharp/; revision=21276 --- ChangeLog | 7 +++++++ generator/SymbolTable.cs | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 38e13bce1..3e86b98df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-12-16 Joe Shaw + + * generator/SymbolTable.cs (MangleName): Add "lock" and "callback" + to the list of names that need to be mangled. The former is a C# + reserved keyword and the latter is already used as an argument to + methods which marshal callbacks. + 2003-12-15 Mike Kestner * generator/BoxedGen.cs : s/uint/GLib.GType diff --git a/generator/SymbolTable.cs b/generator/SymbolTable.cs index a03df3ee8..a0e8d4cb7 100644 --- a/generator/SymbolTable.cs +++ b/generator/SymbolTable.cs @@ -318,6 +318,10 @@ namespace GtkSharp.Generation { return "_new"; case "base": return "_base"; + case "lock": + return "_lock"; + case "callback": + return "cb"; default: break; }