ruby-changes:15897
From: yugui <ko1@a...>
Date: Sun, 16 May 2010 21:17:19 +0900 (JST)
Subject: [ruby-changes:15897] Ruby:r27836 (ruby_1_9_2): merges r27764 from trunk into ruby_1_9_2.
yugui 2010-05-16 21:15:36 +0900 (Sun, 16 May 2010) New Revision: 27836 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27836 Log: merges r27764 from trunk into ruby_1_9_2. -- * ext/sdbm/_sdbm.c: include unistd.h before sdbm.h for off_t. fix compilation problem on FreeBSD 6.4. Modified files: branches/ruby_1_9_2/ChangeLog branches/ruby_1_9_2/ext/sdbm/_sdbm.c Index: ruby_1_9_2/ChangeLog =================================================================== --- ruby_1_9_2/ChangeLog (revision 27835) +++ ruby_1_9_2/ChangeLog (revision 27836) @@ -1,3 +1,8 @@ +Thu May 13 07:37:49 2010 Tanaka Akira <akr@f...> + + * ext/sdbm/_sdbm.c: include unistd.h before sdbm.h for off_t. + fix compilation problem on FreeBSD 6.4. + Wed May 12 11:39:10 2010 NAKAMURA Usaku <usa@r...> * ext/socket/extconf.rb: test all IPPROTO_* constants for recent Win32 Index: ruby_1_9_2/ext/sdbm/_sdbm.c =================================================================== --- ruby_1_9_2/ext/sdbm/_sdbm.c (revision 27835) +++ ruby_1_9_2/ext/sdbm/_sdbm.c (revision 27836) @@ -13,6 +13,11 @@ #include "ruby/config.h" #include "ruby/defines.h" + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + #include "sdbm.h" /* @@ -23,10 +28,6 @@ #define BYTESIZ 8 -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - #ifdef BSD42 #define SEEK_SET L_SET #define memset(s,c,n) bzero(s, n) /* only when c is zero */ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/