From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23365 invoked by alias); 3 Feb 2006 21:51:53 -0000 Received: (qmail 23346 invoked by uid 22791); 3 Feb 2006 21:51:51 -0000 X-Spam-Check-By: sourceware.org Received: from nevyn.them.org (HELO nevyn.them.org) (66.93.172.17) by sourceware.org (qpsmtpd/0.31.1) with ESMTP; Fri, 03 Feb 2006 21:51:49 +0000 Received: from drow by nevyn.them.org with local (Exim 4.54) id 1F58qI-0000to-IR for gdb-patches@sourceware.org; Fri, 03 Feb 2006 16:51:46 -0500 Date: Fri, 03 Feb 2006 21:51:00 -0000 From: Daniel Jacobowitz To: gdb-patches@sourceware.org Subject: [ob] Rename NO_ERROR Message-ID: <20060203215146.GA3349@nevyn.them.org> Mail-Followup-To: gdb-patches@sourceware.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.8i X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-02/txt/msg00046.txt.bz2 The Windows (at least mingw32's version) headers apparently define NO_ERROR. The least of several cretinous things I've learned about Windows programming in the last week. Committed as obvious. -- Daniel Jacobowitz CodeSourcery 2006-02-03 Daniel Jacobowitz * exceptions.h (enum errors): Rename NO_ERROR to GDB_NO_ERROR. * exceptions.c (exception_none, exceptions_state_mc_init) (throw_vfatal): Use GDB_NO_ERROR. Index: src/gdb/exceptions.c =================================================================== --- src.orig/gdb/exceptions.c 2006-02-03 15:13:03.000000000 -0500 +++ src/gdb/exceptions.c 2006-02-03 15:13:18.000000000 -0500 @@ -1,8 +1,8 @@ /* Exception (throw catch) mechanism, for GDB, the GNU debugger. Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free - Software Foundation, Inc. + 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This file is part of GDB. @@ -32,7 +32,7 @@ #include "gdb_string.h" #include "serial.h" -const struct gdb_exception exception_none = { 0, NO_ERROR, NULL }; +const struct gdb_exception exception_none = { 0, GDB_NO_ERROR, NULL }; /* Possible catcher states. */ enum catcher_state { @@ -79,7 +79,7 @@ exceptions_state_mc_init (struct ui_out /* Start with no exception, save it's address. */ exception->reason = 0; - exception->error = NO_ERROR; + exception->error = GDB_NO_ERROR; exception->message = NULL; new_catcher->exception = exception; @@ -404,7 +404,7 @@ throw_verror (enum errors error, const c NORETURN void throw_vfatal (const char *fmt, va_list ap) { - throw_it (RETURN_QUIT, NO_ERROR, fmt, ap); + throw_it (RETURN_QUIT, GDB_NO_ERROR, fmt, ap); } NORETURN void Index: src/gdb/exceptions.h =================================================================== --- src.orig/gdb/exceptions.h 2006-02-03 15:13:03.000000000 -0500 +++ src/gdb/exceptions.h 2006-02-03 15:13:24.000000000 -0500 @@ -1,8 +1,8 @@ /* Exception (throw catch) mechanism, for GDB, the GNU debugger. Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free - Software Foundation, Inc. + 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This file is part of GDB. @@ -50,7 +50,7 @@ typedef int return_mask; /* Describe all exceptions. */ enum errors { - NO_ERROR, + GDB_NO_ERROR, /* Any generic error, the corresponding text is in exception.message. */ GENERIC_ERROR,