diff -ur mod_ruby-1.1.1/apachelib.c mod_ruby-1.1.1-/apachelib.c --- mod_ruby-1.1.1/apachelib.c Tue May 21 13:38:57 2002 +++ mod_ruby-1.1.1-/apachelib.c Tue Nov 11 07:53:30 2003 @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include +//#include #include "mod_ruby.h" #include "apachelib.h" diff -ur mod_ruby-1.1.1/configure.rb mod_ruby-1.1.1-/configure.rb --- mod_ruby-1.1.1/configure.rb Mon Mar 17 11:34:23 2003 +++ mod_ruby-1.1.1-/configure.rb Tue Nov 11 07:53:30 2003 @@ -462,12 +462,15 @@ } if $APXS - $CFLAGS += " " + `#{$APXS} -q CFLAGS`.chomp - $APACHE_INCLUDES = "-I" + `#{$APXS} -q INCLUDEDIR`.chomp - $APACHE_LIBEXECDIR = `#{$APXS} -q LIBEXECDIR`.chomp - if $? != 0 - AC_MSG_ERROR("failed to exec #{$APXS}") - end +# $CFLAGS += " " + `#{$APXS} -q CFLAGS`.chomp +# $APACHE_INCLUDES = "-I" + `#{$APXS} -q INCLUDEDIR`.chomp +# $APACHE_LIBEXECDIR = `#{$APXS} -q LIBEXECDIR`.chomp +# if $? != 0 +# AC_MSG_ERROR("failed to exec #{$APXS}") +# end + $CFLAGS += " " + $APACHE_INCLUDES = "-Id:/Apache2/include" + $APACHE_LIBEXECDIR = "d:/Apache2/lib" $TARGET = "mod_ruby.so" $INSTALL_TARGET = "install-shared" AC_MSG_RESULT("yes") diff -ur mod_ruby-1.1.1/mod_ruby.c mod_ruby-1.1.1-/mod_ruby.c --- mod_ruby-1.1.1/mod_ruby.c Mon Mar 17 11:34:23 2003 +++ mod_ruby-1.1.1-/mod_ruby.c Tue Nov 11 07:53:30 2003 @@ -647,7 +647,8 @@ #elif defined(HAVE_DYLD) NSUnLinkModule(handle, FALSE); #else - dlclose(handle); +// dlclose(handle); + FreeLibrary(handle); #endif } @@ -663,7 +664,7 @@ } #ifdef APR_HAS_THREADS -static void *ruby_thread_start(apr_thread_t *t, void *data) +static void * APR_THREAD_FUNC ruby_thread_start(apr_thread_t *t, void *data) { server_rec *s = (server_rec *) data; ruby_request_t *req; diff -ur mod_ruby-1.1.1/mod_ruby.h mod_ruby-1.1.1-/mod_ruby.h --- mod_ruby-1.1.1/mod_ruby.h Mon Mar 17 11:37:49 2003 +++ mod_ruby-1.1.1-/mod_ruby.h Tue Nov 11 08:07:49 2003 @@ -30,6 +30,9 @@ #ifndef MOD_RUBY_H #define MOD_RUBY_H +#include "ruby.h" +#include "rubyio.h" + #include "httpd.h" #include "http_config.h" #include "http_core.h" @@ -39,8 +42,6 @@ #include "http_request.h" #include "util_script.h" -#include "ruby.h" -#include "rubyio.h" #include "version.h" #include "util.h" diff -ur mod_ruby-1.1.1/request.c mod_ruby-1.1.1-/request.c --- mod_ruby-1.1.1/request.c Mon Mar 17 11:34:23 2003 +++ mod_ruby-1.1.1-/request.c Tue Nov 11 07:53:30 2003 @@ -715,6 +715,7 @@ return data->notes; } +typedef unsigned int mode_t; #ifdef APACHE2 static mode_t get_mode(apr_finfo_t *finfo) { @@ -752,13 +753,13 @@ mode |= S_IFCHR; break; case APR_BLK: - mode |= S_IFBLK; +// mode |= S_IFBLK; break; case APR_PIPE: - mode |= S_IFIFO; +// mode |= S_IFIFO; break; case APR_LNK: - mode |= S_IFLNK; +// mode |= S_IFLNK; break; case APR_SOCK: #if !defined(BEOS) && defined(S_ISSOCK) @@ -790,8 +791,8 @@ st->st_ino = data->request->finfo.inode; st->st_nlink = data->request->finfo.nlink; st->st_mode = get_mode(&data->request->finfo); - st->st_uid = data->request->finfo.user; - st->st_gid = data->request->finfo.group; + st->st_uid = (int)data->request->finfo.user; + st->st_gid = (int)data->request->finfo.group; st->st_size = data->request->finfo.size; st->st_atime = apr_time_sec(data->request->finfo.atime); st->st_mtime = apr_time_sec(data->request->finfo.mtime);