diff --git a/ChangeLog b/ChangeLog
index a67d72b..cf92c8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-28  Bruno Haible  <bruno@linuix.math.u-bordeaux.fr>
 
+        * lib/getopt.h (struct option): Use "const" also when compiling in
+          C++ mode. Avoids warnings from Sun CC and HP-UX aCC.
+
         * doc/Makefile.in (docdir): Change from $(datadir)/doc/@PACKAGE@ to
           $(prefix)/doc/@PACKAGE@, following the newest GNU standards.
 
diff --git a/lib/getopt.h b/lib/getopt.h
index 5be6319..a9d75f2 100644
--- a/lib/getopt.h
+++ b/lib/getopt.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+   Copyright (C) 1989-1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -78,7 +78,7 @@ extern int optopt;
 
 struct option
 {
-#if defined (__STDC__) && __STDC__
+#if (defined (__STDC__) && __STDC__) || defined (__cplusplus)
   const char *name;
 #else
   char *name;