diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 390fa36211..6e544a3b8b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2003-02-01  Andrew Cagney  <ac131313@redhat.com>
 
+	* gdb_dirent.h: Mark up valid uses of <dirent.h>, d_namelen and
+	strlen d_name.
+
 	* main.c (captured_main): Delete #ifdef ADDITIONAL_OPTIONS,
 	ADDITIONAL_OPTION_CASES, and ADDITIONAL_OPTION_HANDLER code.
 	(print_gdb_help): Delete #ifdef ADDITIONAL_OPTION_HELP code.
diff --git a/gdb/gdb_dirent.h b/gdb/gdb_dirent.h
index eb14767655..ba28ca5561 100644
--- a/gdb/gdb_dirent.h
+++ b/gdb/gdb_dirent.h
@@ -23,11 +23,11 @@
 
 /* See description of `AC_HEADER_DIRENT' in the Autoconf manual.  */
 #ifdef HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMELEN(dirent) strlen((dirent)->d_name)
+# include <dirent.h>		/* OK: dirent.h */
+# define NAMELEN(dirent) strlen ((dirent)->d_name)	/* OK: strlen d_name */
 #else
 # define dirent direct
-# define NAMELEN(dirent) (dirent)->d_namelen
+# define NAMELEN(dirent) (dirent)->d_namelen	/* OK: d_namelen */
 # ifdef HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
 # endif