nobu	2010-05-11 11:49:46 +0900 (Tue, 11 May 2010)

  New Revision: 27730

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27730

  Log:
    * ext/sdbm/sdbm.h (DBM): large file support on win32.
      [ruby-core:23039]
    
    * ext/sdbm/depend: objects depend on sdbm.h.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/sdbm/_sdbm.c
    branches/ruby_1_9_2/ext/sdbm/depend
    branches/ruby_1_9_2/ext/sdbm/sdbm.h
    branches/ruby_1_9_2/version.h
    trunk/ChangeLog
    trunk/ext/sdbm/_sdbm.c
    trunk/ext/sdbm/depend
    trunk/ext/sdbm/sdbm.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27729)
+++ ChangeLog	(revision 27730)
@@ -1,3 +1,10 @@
+Tue May 11 11:49:44 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/sdbm/sdbm.h (DBM): large file support on win32.
+	  [ruby-core:23039]
+
+	* ext/sdbm/depend: objects depend on sdbm.h.
+
 Tue May 11 09:57:05 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval_intern.h (rb_vm_get_sourceline): add prototype.
Index: ext/sdbm/depend
===================================================================
--- ext/sdbm/depend	(revision 27729)
+++ ext/sdbm/depend	(revision 27730)
@@ -1,2 +1,2 @@
-_sdbm.o: _sdbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
-init.o: init.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+_sdbm.o: _sdbm.c sdbm.h $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+init.o: init.c sdbm.h $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
Index: ext/sdbm/_sdbm.c
===================================================================
--- ext/sdbm/_sdbm.c	(revision 27729)
+++ ext/sdbm/_sdbm.c	(revision 27730)
@@ -11,9 +11,9 @@
 /*char sdbm_rcsid[] = "$Id$";*/
 #endif
 
-#include "sdbm.h"
 #include "ruby/config.h"
 #include "ruby/defines.h"
+#include "sdbm.h"
 
 /*
  * sdbm - ndbm work-alike hashed database library
Index: ext/sdbm/sdbm.h
===================================================================
--- ext/sdbm/sdbm.h	(revision 27729)
+++ ext/sdbm/sdbm.h	(revision 27730)
@@ -7,6 +7,8 @@
 #ifndef	_SDBM_H_
 #define	_SDBM_H_
 
+#include <stdio.h>
+
 #define DBLKSIZ 4096
 #define PBLKSIZ 1024
 #define PAIRMAX 1008			/* arbitrary on PBLKSIZ-N */
@@ -19,11 +21,11 @@
 	int dirf;		       /* directory file descriptor */
 	int pagf;		       /* page file descriptor */
 	int flags;		       /* status/error flags, see below */
-	long maxbno;		       /* size of dirfile in bits */
+	int keyptr;		       /* current key for nextkey */
+	off_t maxbno;		       /* size of dirfile in bits */
 	long curbit;		       /* current bit number */
 	long hmask;		       /* current hash mask */
 	long blkptr;		       /* current block for nextkey */
-	int keyptr;		       /* current key for nextkey */
 	long blkno;		       /* current page to read/write */
 	long pagbno;		       /* current page in pagbuf */
 	char pagbuf[PBLKSIZ];	       /* page file block buffer */
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27729)
+++ ruby_1_9_2/ChangeLog	(revision 27730)
@@ -1,3 +1,10 @@
+Tue May 11 11:49:44 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/sdbm/sdbm.h (DBM): large file support on win32.
+	  [ruby-core:23039]
+
+	* ext/sdbm/depend: objects depend on sdbm.h.
+
 Mon May 10 23:50:19 2010  Tanaka Akira  <akr@f...>
 
 	* pack.c (pack_unpack): add a missing break.
Index: ruby_1_9_2/ext/sdbm/depend
===================================================================
--- ruby_1_9_2/ext/sdbm/depend	(revision 27729)
+++ ruby_1_9_2/ext/sdbm/depend	(revision 27730)
@@ -1,2 +1,2 @@
-_sdbm.o: _sdbm.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
-init.o: init.c $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+_sdbm.o: _sdbm.c sdbm.h $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
+init.o: init.c sdbm.h $(hdrdir)/ruby.h $(topdir)/config.h $(hdrdir)/defines.h
Index: ruby_1_9_2/ext/sdbm/_sdbm.c
===================================================================
--- ruby_1_9_2/ext/sdbm/_sdbm.c	(revision 27729)
+++ ruby_1_9_2/ext/sdbm/_sdbm.c	(revision 27730)
@@ -11,9 +11,9 @@
 /*char sdbm_rcsid[] = "$Id$";*/
 #endif
 
-#include "sdbm.h"
 #include "ruby/config.h"
 #include "ruby/defines.h"
+#include "sdbm.h"
 
 /*
  * sdbm - ndbm work-alike hashed database library
Index: ruby_1_9_2/ext/sdbm/sdbm.h
===================================================================
--- ruby_1_9_2/ext/sdbm/sdbm.h	(revision 27729)
+++ ruby_1_9_2/ext/sdbm/sdbm.h	(revision 27730)
@@ -7,6 +7,8 @@
 #ifndef	_SDBM_H_
 #define	_SDBM_H_
 
+#include <stdio.h>
+
 #define DBLKSIZ 4096
 #define PBLKSIZ 1024
 #define PAIRMAX 1008			/* arbitrary on PBLKSIZ-N */
@@ -19,11 +21,11 @@
 	int dirf;		       /* directory file descriptor */
 	int pagf;		       /* page file descriptor */
 	int flags;		       /* status/error flags, see below */
-	long maxbno;		       /* size of dirfile in bits */
+	int keyptr;		       /* current key for nextkey */
+	off_t maxbno;		       /* size of dirfile in bits */
 	long curbit;		       /* current bit number */
 	long hmask;		       /* current hash mask */
 	long blkptr;		       /* current block for nextkey */
-	int keyptr;		       /* current key for nextkey */
 	long blkno;		       /* current page to read/write */
 	long pagbno;		       /* current page in pagbuf */
 	char pagbuf[PBLKSIZ];	       /* page file block buffer */
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 27729)
+++ ruby_1_9_2/version.h	(revision 27730)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2010-05-10"
+#define RUBY_RELEASE_DATE "2010-05-11"
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -7,7 +7,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/