Changeset 80760

Timestamp:

07/16/11 15:20:14 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Removed leading "MACHO_" from constants namespaced anyway

Location:

branches/gsoc11-rev-upgrade/base/src/machista1.0

Files:

• machista.i (modified) (1 diff)
• machista_wrap.c (modified) (1 diff)
• tests/test.tcl (modified) (1 diff)

branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i

@@ -14 +14 @@
 %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)
 

branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c

@@ -2620 +2620 @@
   
   
-  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;
 }

branches/gsoc11-rev-upgrade/base/src/machista1.0/tests/test.tcl

@@ -10 +10 @@
         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]