projects / packages / freeradius-server.git / blame
| Commit | Line | Data |
|---|---|---|
| ab64f8e9 JR |
1 | --- freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in~ 2009-09-14 16:43:29.000000000 +0200 |
| 2 | +++ freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in 2010-03-01 13:53:59.571124248 +0100 | |
| 76608aa4 | 3 | @@ -57,12 +57,13 @@ |
| ab64f8e9 JR |
4 | # RB_LIB_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('libdir')"` |
| 5 | # RB_EXTRA_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('LIBS')"` | |
| 6 | RB_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('LIBRUBYARG_SHARED')"` | |
| 7 | - RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('includedir')"` | |
| 8 | + RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('rubyhdrdir')"` | |
| 9 | RB_CFLAGS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('CFLAGS')"` | |
| 10 | RB_ARCH_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('archdir')"` | |
| 62b7453d | 11 | + RB_ARCH_INC_DIR=`${RUBYBIN} -r rbconfig -e 'puts RbConfig.expand("$(rubyhdrdir)/$(arch)")'` |
| ab64f8e9 | 12 | |
| 76608aa4 JR |
13 | old_CFLAGS=$CFLAGS |
| 14 | - CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_DIR} -I${RB_INC_DIR}" | |
| 15 | + CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_INC_DIR} -I${RB_INC_DIR}" | |
| 16 | # smart_try_dir=$RB_INC_DIR | |
| 17 | FR_SMART_CHECK_INCLUDE(ruby.h) | |
| 18 | if test "x$ac_cv_header_ruby_h" != "xyes"; then | |
| d9e54585 JR |
19 | --- freeradius-server-2.1.7/src/modules/rlm_ruby/rlm_ruby.c~ 2009-09-14 16:43:29.000000000 +0200 |
| 20 | +++ freeradius-server-2.1.7/src/modules/rlm_ruby/rlm_ruby.c 2010-03-01 15:21:45.111123747 +0100 | |
| 21 | @@ -113,7 +113,7 @@ | |
| 22 | } | |
| 23 | ||
| 24 | /* Get the array size. */ | |
| 25 | - outertuplesize = RARRAY(rb_value)->len; | |
| 26 | + outertuplesize = RARRAY_LEN(rb_value); | |
| 27 | ||
| 28 | for (i = 0; i < outertuplesize; i++) { | |
| 29 | VALUE pTupleElement = rb_ary_entry(rb_value, i); | |
| 30 | @@ -124,7 +124,7 @@ | |
| 31 | /* Check if it's a pair */ | |
| 32 | int tuplesize; | |
| 33 | ||
| 34 | - if ((tuplesize = RARRAY(pTupleElement)->len) != 2) { | |
| 35 | + if ((tuplesize = RARRAY_LEN(pTupleElement)) != 2) { | |
| 36 | radlog(L_ERR, "%s: tuple element %d is a tuple " | |
| 37 | " of size %d. must be 2\n", function_name, | |
| 38 | i, tuplesize); |