2004-01-02 Andrew Cagney <cagney@redhat.com>

	* utils.c (do_my_cleanups): Make static, add forward declaration.
	* defs.h (do_my_cleanups): Delete declaration.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2a7f145..e144796 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-02  Andrew Cagney  <cagney@redhat.com>
+
+       * utils.c (do_my_cleanups): Make static, add forward declaration.
+       * defs.h (do_my_cleanups): Delete declaration.
+
 2004-01-02  Eli Zaretskii  <eliz@elta.co.il>
 
        * config/djgpp/fnchange.lst: Add lines for gdb/ChangeLog-2003 and

diff --git a/gdb/defs.h b/gdb/defs.h
index 9db0af2..443ad6b 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -355,7 +355,6 @@ extern void request_quit (int);
 
 extern void do_cleanups (struct cleanup *);
 extern void do_final_cleanups (struct cleanup *);
-extern void do_my_cleanups (struct cleanup **, struct cleanup *);
 extern void do_run_cleanups (struct cleanup *);
 extern void do_exec_cleanups (struct cleanup *);
 extern void do_exec_error_cleanups (struct cleanup *);

diff --git a/gdb/testsuite/gdb.base/fileio.c b/gdb/testsuite/gdb.base/fileio.c
index 591b3b6..9c40eb4 100644 (file)
--- a/gdb/testsuite/gdb.base/fileio.c
+++ b/gdb/testsuite/gdb.base/fileio.c
@@ -103,7 +103,7 @@ test_open ()
     close (ret);
   /* Open for write but no write permission */
   errno = 0;
-  ret = open (NOWRITE, O_CREAT | O_RDONLY, S_IRUSR | S_IWUSR);
+  ret = open (NOWRITE, O_CREAT | O_RDONLY, S_IRUSR);
   if (ret >= 0)
     {
       close (ret);

diff --git a/gdb/utils.c b/gdb/utils.c
index 5868465..ba936d5 100644 (file)
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -96,6 +96,8 @@ static void vfprintf_maybe_filtered (struct ui_file *, const char *,
 
 static void fputs_maybe_filtered (const char *, struct ui_file *, int);
 
+static void do_my_cleanups (struct cleanup **, struct cleanup *);
+
 #if defined (USE_MMALLOC) && !defined (NO_MMCHECK)
 static void malloc_botch (void);
 #endif
@@ -311,7 +313,7 @@ do_exec_error_cleanups (struct cleanup *old_chain)
   do_my_cleanups (&exec_error_cleanup_chain, old_chain);
 }
 
-void
+static void
 do_my_cleanups (struct cleanup **pmy_chain,
                struct cleanup *old_chain)
 {