diff --git a/ChangeLog b/ChangeLog
index 08ef7ba3bc..6665794f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep  3 04:03:06 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/curses/curses.c: define _XOPEN_SOURCE_EXTENDED on HP-UX.
+
 Sat Sep  2 23:59:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (Init_String): undef Symbol#new.
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 3ff20f41c0..45118d19fd 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -28,6 +28,10 @@
 # endif
 # include <curses_colr/curses.h>
 #else
+# if defined(__hpux) && !defined(_XOPEN_SOURCE_EXTENDED)
+/* HP-UX needs _XOPEN_SOURCE_EXTENDED to use getmaxy, etc. */
+#  define _XOPEN_SOURCE_EXTENDED
+# endif
 # include <curses.h>
 # if defined(__bsdi__) || defined(__NetBSD__) || defined(__APPLE__)
 #  if !defined(_maxx)
@@ -1173,7 +1177,6 @@ window_color_set(VALUE obj, VALUE col)
   GetWINDOW(obj, winp);
   res = wcolor_set(winp->window, NUM2INT(col), NULL);
   return (res == OK) ? Qtrue : Qfalse;
-  return Qfalse;
 }
 #endif /* defined(USE_COLOR) && defined(HAVE_WCOLOR_SET) */