From c9a9af9c9c80d2705a2ae9810df299fd478b1238 Mon Sep 17 00:00:00 2001 From: Surendra Singhi Date: Sun, 15 Oct 2006 12:04:39 +0000 Subject: [PATCH] Patch 1560983. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9452 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/CHANGES.current | 17 ++++++++++------- SWIG/Source/Modules/cffi.cxx | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/SWIG/CHANGES.current b/SWIG/CHANGES.current index effda098a..164f7aeed 100644 --- a/SWIG/CHANGES.current +++ b/SWIG/CHANGES.current @@ -1,16 +1,19 @@ Version 1.3.30 (in progress) ============================ +10/15/2006: efuzzyone + [CFFI] Suppress generating defctype for enums, thanks to Arthur Smyles. Patch 1560983. + 10/14/2006: wuzzeb (John Lenz) - [Chicken] Minor fix to make SWIG work with the (as yet unreleased) chicken 2.5 + [Chicken] Minor fix to make SWIG work with the (as yet unreleased) chicken 2.5 - [Guile,Chicken] Fix SF Bug 1573892. Added an ext_test to the test suite to test - this bug, but this test can not really be made generic because the external code must - plug into the target language interpreter directly. - See Examples/test-suite/chicken/ext_test.i and ext_test_external.cxx + [Guile,Chicken] Fix SF Bug 1573892. Added an ext_test to the test suite to test + this bug, but this test can not really be made generic because the external code must + plug into the target language interpreter directly. + See Examples/test-suite/chicken/ext_test.i and ext_test_external.cxx - Added a %.externaltest to common.mk, and any interested language modules can - copy and slightly modify either the chicken or the guile ext_test.i + Added a %.externaltest to common.mk, and any interested language modules can + copy and slightly modify either the chicken or the guile ext_test.i 10/14/2006: mgossage [Lua] added OUTPUT& for all number types, added a long long type diff --git a/SWIG/Source/Modules/cffi.cxx b/SWIG/Source/Modules/cffi.cxx index 54cca1f39..e653f03f1 100644 --- a/SWIG/Source/Modules/cffi.cxx +++ b/SWIG/Source/Modules/cffi.cxx @@ -550,7 +550,7 @@ int CFFI :: variableWrapper(Node *n) { } int CFFI :: typedefHandler(Node *n) { - if(generate_typedef_flag) { + if(generate_typedef_flag && strncmp(Char(Getattr(n,"type")),"enum",4)) { String *lisp_name = lispify_name(n,Getattr(n,"name"),"'typename"); Printf(f_cl,"\n(cffi:defctype %s %s)\n", lisp_name,