diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5920cef51..a303213f4 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Sun May  6 11:55:40 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* string.h (cygwin_strchr): Make 'static inline' so that things will
+	still work when optimized.
+
 Sat May  5 01:04:11 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* exceptions.cc (handle_exceptions): Vastly increase test for exception
diff --git a/winsup/cygwin/string.h b/winsup/cygwin/string.h
index 93f0c9001..84dc14cb7 100644
--- a/winsup/cygwin/string.h
+++ b/winsup/cygwin/string.h
@@ -19,7 +19,7 @@ extern "C" {
 
 #undef strchr
 #define strchr cygwin_strchr
-extern inline __stdcall char *
+static inline __stdcall char *
 strchr (const char *s, int c)
 {
   register char * res;