1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in: can't subtract void *.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nari 2011-07-08 05:39:50 +00:00
parent b4582e79d7
commit c3e0526269
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Jul 8 14:29:47 2011 Narihiro Nakamura <authornari@gmail.com>
* configure.in: can't subtract void *.
Fri Jul 8 14:33:26 2011 NAKAMURA Usaku <usa@ruby-lang.org> Fri Jul 8 14:33:26 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (config.h): define GC_MARK_STACKFRAME_WORD. * win32/Makefile.sub (config.h): define GC_MARK_STACKFRAME_WORD.

10
configure.in
View File

@ -1235,7 +1235,7 @@ AC_CACHE_CHECK(for gc_mark and gc_children stack frame approximate size(word), r
CFLAGS="-O0" CFLAGS="-O0"
AC_TRY_RUN([ AC_TRY_RUN([
int word; int word;
void *stack_start; char *stack_start;
void void
set_stackframe_word() set_stackframe_word()
@ -1243,11 +1243,11 @@ set_stackframe_word()
int dumy = 42; int dumy = 42;
int diff; int diff;
if (stack_start < (void *)&dumy) { if (stack_start < (char *)&dumy) {
diff = (int)((void *)&dumy - stack_start); diff = (int)((char *)&dumy - stack_start);
} }
else { else {
diff = (int)(stack_start - (void *)&dumy); diff = (int)(stack_start - (char *)&dumy);
} }
word = (diff/sizeof(void *)); word = (diff/sizeof(void *));
if ((diff % sizeof(void *)) != 0) { if ((diff % sizeof(void *)) != 0) {
@ -1275,7 +1275,7 @@ int
main() { main() {
int dumy = 42; int dumy = 42;
stack_start = (void *)&dumy; stack_start = (char *)&dumy;
gc_mark(0, 0, 255); gc_mark(0, 0, 255);
return word; return word;
} }