diff --git a/ChangeLog b/ChangeLog
index 537ebc26e3..d2bfea03af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-05-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* ctype/ctype.h: Don't optimize toupper/tolower for C++.
+
 1999-05-23  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* hurd/set-host.c (_hurd_set_host_config): Use mode 0644, not 0600.
diff --git a/ctype/ctype.h b/ctype/ctype.h
index fd4f9e8ca9..11f92068d4 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -163,7 +163,7 @@ toupper (int __c) __THROW
 }
 #endif
 
-#if __GNUC__ >= 2 && defined __OPTIMIZE__
+#if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus
 # define __tobody(c, f, a) \
   ({ int __res;								      \
      if (sizeof (c) > 1)						      \