[Fxruby-commits] CVS: FXRuby/ext/fox markfuncs.cpp,1.13,1.13.2.1 FXRuby.cpp,1.40,1.40.2.1

[Lyle J. <ly...@us...>]

Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv9881

Modified Files:
      Tag: release10
	markfuncs.cpp FXRuby.cpp 
Log Message:
Corrected argument types for calls to rb_gc_mark() in FXRuby.cpp and
markfuncs.cpp. For Ruby 1.6, the prototype for rb_gc_mark() should be
rb_gc_mark(void *) and for Ruby 1.7 it is rb_gc_mark(VALUE).


Index: markfuncs.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/markfuncs.cpp,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** markfuncs.cpp	2 Mar 2002 01:39:49 -0000	1.13
--- markfuncs.cpp	25 Apr 2002 02:44:26 -0000	1.13.2.1
***************
*** 5,8 ****
--- 5,14 ----
  #include "FXRbCommon.h"
  
+ #if RUBY_VERSION_CODE < 172
+ #define MARK(p) rb_gc_mark(reinterpret_cast<void *>((p)))
+ #else
+ #define MARK(p) rb_gc_mark(reinterpret_cast<VALUE>((p)))
+ #endif
+ 
  // FIXME: How to get to the target objects stored in the accelerator
  // table? This is currently private (not protected) data for the class.
***************
*** 83,87 ****
    if(self){
      FXRbGcMark(self->getApp());
!     if(self->getUserData()) rb_gc_mark((VALUE) self->getUserData());
      }
    }
--- 89,93 ----
    if(self){
      FXRbGcMark(self->getApp());
!     if(self->getUserData()) MARK(self->getUserData());
      }
    }
***************
*** 203,207 ****
      for(FXint i=0; i<self->getNumItems(); i++){
        if(self->getItemData(i))
!         rb_gc_mark((VALUE) self->getItemData(i));
        }
      }
--- 209,213 ----
      for(FXint i=0; i<self->getNumItems(); i++){
        if(self->getItemData(i))
!         MARK(self->getItemData(i));
        }
      }
***************
*** 310,314 ****
      FXRbGcMark(self->getClosedIcon());
      if(self->getData())
!       rb_gc_mark((VALUE) self->getData());
      }
    }
--- 316,320 ----
      FXRbGcMark(self->getClosedIcon());
      if(self->getData())
!       MARK(self->getData());
      }
    }
***************
*** 340,344 ****
      FXRbGcMark(self->getIcon());
      if(self->getData())
!       rb_gc_mark((VALUE) self->getData());
      }
    }
--- 346,350 ----
      FXRbGcMark(self->getIcon());
      if(self->getData())
!       MARK(self->getData());
      }
    }
***************
*** 360,364 ****
        FXRbListItem::markfunc(item);
        if(self->getItemData(i))
!         rb_gc_mark((VALUE) self->getItemData(i));
        }
      FXRbGcMark(self->getFont());
--- 366,370 ----
        FXRbListItem::markfunc(item);
        if(self->getItemData(i))
!         MARK(self->getItemData(i));
        }
      FXRbGcMark(self->getFont());
***************
*** 373,377 ****
      FXRbGcMark(self->getIcon());
      if(self->getData())
!       rb_gc_mark((VALUE) self->getData());
      }
    }
--- 379,383 ----
      FXRbGcMark(self->getIcon());
      if(self->getData())
!       MARK(self->getData());
      }
    }
***************
*** 393,397 ****
          FXRbGcMark(self->getItemIcon(i,j));
          if(self->getItemData(i,j))
!           rb_gc_mark((VALUE) self->getItemData(i,j));
          }
        }
--- 399,403 ----
          FXRbGcMark(self->getItemIcon(i,j));
          if(self->getItemData(i,j))
!           MARK(self->getItemData(i,j));
          }
        }
***************
*** 406,410 ****
      FXRbGcMark(self->getIcon());
      if(self->getData())
!       rb_gc_mark((VALUE) self->getData());
      }
    }
--- 412,416 ----
      FXRbGcMark(self->getIcon());
      if(self->getData())
!       MARK(self->getData());
      }
    }
***************
*** 426,430 ****
        FXRbHeaderItem::markfunc(item);
        if(item->getData())
!         rb_gc_mark((VALUE) item->getData());
        }
      FXRbGcMark(self->getFont());
--- 432,436 ----
        FXRbHeaderItem::markfunc(item);
        if(item->getData())
!         MARK(item->getData());
        }
      FXRbGcMark(self->getFont());
***************
*** 440,444 ****
      FXRbGcMark(self->getMiniIcon());
      if(self->getData())
!       rb_gc_mark((VALUE) self->getData());
      }
    }
--- 446,450 ----
      FXRbGcMark(self->getMiniIcon());
      if(self->getData())
!       MARK(self->getData());
      }
    }
***************
*** 461,465 ****
        FXRbIconItem::markfunc(item);
        if(self->getItemData(i))
!         rb_gc_mark((VALUE) self->getItemData(i));
        }
      FXRbGcMark(self->getFont());
--- 467,471 ----
        FXRbIconItem::markfunc(item);
        if(self->getItemData(i))
!         MARK(self->getItemData(i));
        }
      FXRbGcMark(self->getFont());
***************
*** 745,749 ****
        FXRbGcMark(self->getItemIcon(i));
        if(self->getItemData(i))
!         rb_gc_mark((VALUE) self->getItemData(i));
        }
      }
--- 751,755 ----
        FXRbGcMark(self->getItemIcon(i));
        if(self->getItemData(i))
!         MARK(self->getItemData(i));
        }
      }

Index: FXRuby.cpp
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/FXRuby.cpp,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -C2 -d -r1.40 -r1.40.2.1
*** FXRuby.cpp	3 Apr 2002 21:40:27 -0000	1.40
--- FXRuby.cpp	25 Apr 2002 02:44:26 -0000	1.40.2.1
***************
*** 158,162 ****
--- 158,166 ----
      VALUE value=FXRbGetRubyObj(obj);
      if(value!=Qnil){
+ #if RUBY_VERSION_CODE < 172
+       rb_gc_mark(reinterpret_cast<void *>(value));
+ #else
        rb_gc_mark(value);
+ #endif
        }
      }