[80760] branches/gsoc11-rev-upgrade/base/src/machista1.0

[cal at macports.org]

Revision: 80760
          http://trac.macports.org/changeset/80760
Author:   cal at macports.org
Date:     2011-07-16 15:20:14 -0700 (Sat, 16 Jul 2011)
Log Message:
-----------
rev-upgrade: Removed leading "MACHO_" from constants namespaced anyway

Modified Paths:
--------------
    branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i
    branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c
    branches/gsoc11-rev-upgrade/base/src/machista1.0/tests/test.tcl

Modified: branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i	2011-07-16 22:02:27 UTC (rev 80759)
+++ branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i	2011-07-16 22:20:14 UTC (rev 80760)
@@ -13,11 +13,22 @@
 
 %include "typemaps.i"
 
+%rename(SUCCESS) MACHO_SUCCESS;
 #define MACHO_SUCCESS   (0x00)
+
+%rename(EFILE) MACHO_EFILE;
 #define MACHO_EFILE     (0x01)
+
+%rename(EMMAP) MACHO_EMMAP;
 #define MACHO_EMMAP     (0x02)
+
+%rename(EMEM) MACHO_EMEM;
 #define MACHO_EMEM      (0x04)
+
+%rename(ERANGE) MACHO_ERANGE;
 #define MACHO_ERANGE    (0x08)
+
+%rename(EMAGIC) MACHO_EMAGIC;
 #define MACHO_EMAGIC    (0x10)
 
 typedef unsigned int uint32_t;

Modified: branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c	2011-07-16 22:02:27 UTC (rev 80759)
+++ branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c	2011-07-16 22:20:14 UTC (rev 80760)
@@ -2619,12 +2619,12 @@
   SWIG_Tcl_InstallConstants(interp, swig_constants);
   
   
-  SWIG_Tcl_SetConstantObj(interp, "machista::MACHO_SUCCESS", SWIG_From_int((int)((0x00))));
-  SWIG_Tcl_SetConstantObj(interp, "machista::MACHO_EFILE", SWIG_From_int((int)((0x01))));
-  SWIG_Tcl_SetConstantObj(interp, "machista::MACHO_EMMAP", SWIG_From_int((int)((0x02))));
-  SWIG_Tcl_SetConstantObj(interp, "machista::MACHO_EMEM", SWIG_From_int((int)((0x04))));
-  SWIG_Tcl_SetConstantObj(interp, "machista::MACHO_ERANGE", SWIG_From_int((int)((0x08))));
-  SWIG_Tcl_SetConstantObj(interp, "machista::MACHO_EMAGIC", SWIG_From_int((int)((0x10))));
+  SWIG_Tcl_SetConstantObj(interp, "machista::SUCCESS", SWIG_From_int((int)((0x00))));
+  SWIG_Tcl_SetConstantObj(interp, "machista::EFILE", SWIG_From_int((int)((0x01))));
+  SWIG_Tcl_SetConstantObj(interp, "machista::EMMAP", SWIG_From_int((int)((0x02))));
+  SWIG_Tcl_SetConstantObj(interp, "machista::EMEM", SWIG_From_int((int)((0x04))));
+  SWIG_Tcl_SetConstantObj(interp, "machista::ERANGE", SWIG_From_int((int)((0x08))));
+  SWIG_Tcl_SetConstantObj(interp, "machista::EMAGIC", SWIG_From_int((int)((0x10))));
   return TCL_OK;
 }
 SWIGEXPORT int Machista_SafeInit(Tcl_Interp *interp) {

Modified: branches/gsoc11-rev-upgrade/base/src/machista1.0/tests/test.tcl
===================================================================
--- branches/gsoc11-rev-upgrade/base/src/machista1.0/tests/test.tcl	2011-07-16 22:02:27 UTC (rev 80759)
+++ branches/gsoc11-rev-upgrade/base/src/machista1.0/tests/test.tcl	2011-07-16 22:20:14 UTC (rev 80760)
@@ -9,7 +9,7 @@
 for {set i 0} {$i < $argc} {incr i} {
 	puts [lindex $argv $i]
 	set rlist [machista::parse_file $h [lindex $argv $i]]
-	if {[lindex $rlist 0] == $machista::MACHO_SUCCESS} {
+	if {[lindex $rlist 0] == $machista::SUCCESS} {
 		set r [lindex $rlist 1]
 		set a [$r cget -mt_archs]
 		while {$a != "NULL"} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110716/7fc954bd/attachment.html>