From b5de0fa7413a260aa570079b5d168ea8781dac4e Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 2 Aug 2001 11:58:29 +0000
Subject: 	The following changes avoid polluting global namespace with
 the 	`enable' and `disable' identifiers, because some platforms define 
 in their system headers symbols with global scope that go by those 	names.

	* breakpoint.h (enum enable_state): Rename from `enum enable'.
	Also rename all the enum members to have the "bp_" prefix.
	(struct breakpoint): Rename the `enable' member to `enable_state'.
	(enum bpdisp): Rename all members to have the "disp_" prefix.

	* breakpoint.c: All users of `enum enable' and `enum bpdisp'
	changed.
	(args_for_catchpoint_enable): Rename the `enable' member to
	`enable_p'.  All users changed.

	* tracepoint.h (enum enable): Remove.
	(struct tracepoint): The member `enabled' is now `int enabled_p'.

	* tracepoint.c: All users of the `enabled' member changed.

	* printcmd.c (struct display): The `status' member is now an int.

	* memattr.h (struct mem_region): Rename the `status' member to
	`enabled_p'.
	(enum enable): Remove.

	* memattr.c: Change all users of the `status' member of struct
	mem_region to use `enabled_p' instead.

	* infcmd.c (run_stack_dummy): Use disp_del instead of del.

	* go32-nat.c: Remove the kludgey work-around for conflicts between
	<dos.h> and "breakpoint.h".
	* tui/tuiSourceWin.c: Use disp_del instead of del.

	* tui/tuiSource.c: Use disp_del instead of del.

	* tui/tuiDisassem.c: Use disp_del instead of del.
---
 gdb/tracepoint.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'gdb/tracepoint.h')

diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 5bd07f4..c464ae1 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -21,12 +21,6 @@
 #if !defined (TRACEPOINT_H)
 #define TRACEPOINT_H 1
 
-#if !defined (BREAKPOINT_H)
-enum enable
-  {
-    disabled, enabled
-  };
-#endif
 /* The data structure for an action: */
 struct action_line
   {
@@ -40,7 +34,7 @@ struct tracepoint
   {
     struct tracepoint *next;
 
-    enum enable enabled;
+    int enabled_p;
 
 #if 0
     /* Type of tracepoint (MVS FIXME: needed?). */
-- 
cgit v1.1