From 806f79de147b128240bda4b34c9f11c4d42a6fb0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 21 Apr 2016 15:18:22 +0200 Subject: [PATCH] No real changes, just rename "proxy_header" to "cheader" Continue getting rid of "proxy" terminology, there is no proxy when using C module, so it's confusing to use this term. --- Lib/c/c.swg | 6 +++--- Lib/c/cexcept.swg | 2 +- Lib/c/{cproxy.swg => cheader.swg} | 4 +--- Source/Modules/c.cxx | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) rename Lib/c/{cproxy.swg => cheader.swg} (85%) diff --git a/Lib/c/c.swg b/Lib/c/c.swg index 4013cfefd..9825e3686 100644 --- a/Lib/c/c.swg +++ b/Lib/c/c.swg @@ -6,7 +6,7 @@ * ----------------------------------------------------------------------------- */ %insert("runtime") "clabels.swg" -%insert("proxy_header") "cproxy.swg" +%insert("cheader") "cheader.swg" %insert("runtime") %{ #include @@ -19,7 +19,7 @@ #define SWIG_contract_assert(expr, msg) if(!(expr)) { printf("%s\n", msg); SWIG_exit(0); } else %} -%fragment("stdbool_inc", "proxy_header") {#include } +%fragment("stdbool_inc", "cheader") {#include } %define same_macro_all_primitive_types_but_void(macro_name, TM) macro_name(TM, short); @@ -354,7 +354,7 @@ template SWIGINTERN SwigObj* SWIG_create_object(T* obj, const char* sy } %} -%insert("proxy_header") %{ +%insert("cheader") %{ typedef struct SwigObjStruct SwigObj; %} diff --git a/Lib/c/cexcept.swg b/Lib/c/cexcept.swg index fae4c9dbe..dd3e6f15a 100644 --- a/Lib/c/cexcept.swg +++ b/Lib/c/cexcept.swg @@ -164,7 +164,7 @@ SWIGINTERN void SWIG_terminate() { SWIG_rt_throw((SwigObj *) klass, msg); %} -%insert("proxy_header") %{ +%insert("cheader") %{ // special value indicating any type of exception like 'catch(...)' #define SWIG_AnyException "SWIG_AnyException" diff --git a/Lib/c/cproxy.swg b/Lib/c/cheader.swg similarity index 85% rename from Lib/c/cproxy.swg rename to Lib/c/cheader.swg index 3b4b7ae11..f33cee1fa 100644 --- a/Lib/c/cproxy.swg +++ b/Lib/c/cheader.swg @@ -1,7 +1,5 @@ /* ----------------------------------------------------------------------------- - * cproxy.swg - * - * Definitions of C specific preprocessor symbols for proxies. + * cheader.swg * ----------------------------------------------------------------------------- */ #ifndef SWIGIMPORT diff --git a/Source/Modules/c.cxx b/Source/Modules/c.cxx index 0d38fe085..430cc8378 100644 --- a/Source/Modules/c.cxx +++ b/Source/Modules/c.cxx @@ -408,7 +408,7 @@ public: Swig_register_filebyname("wrapper", f_wrappers); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("init", f_init); - Swig_register_filebyname("proxy_header", f_wrappers_h); + Swig_register_filebyname("cheader", f_wrappers_h); { String* const include_guard_name = NewStringf("SWIG_%s_WRAP_H_", Char(module));