From 5da19dd2c05e39728501a557f628d594e6e02679 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 16 May 2010 12:15:36 +0000
Subject: [PATCH] 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog        | 5 +++++
 ext/sdbm/_sdbm.c | 9 +++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1365ef5ba..3e656a4626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 13 07:37:49 2010  Tanaka Akira  <akr@fsij.org>
+
+	* 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@ruby-lang.org>
 
 	* ext/socket/extconf.rb: test all IPPROTO_* constants for recent Win32
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 533146f223..b1ffdc04f0 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -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 */