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.

14 files changed, 198 insertions, 173 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 809c5c3d29c..d6e664dcadf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,39 @@
+2001-08-02  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	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".
+
 2001-08-02  Corinna Vinschen  <vinschen@redhat.com>
 
 	* MAINTAINERS: Add myself to the write-after-approval list.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index db330ccfe92..a0ba366c26b 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -137,7 +137,7 @@ static enum print_stop_action print_bp_stop_message (bpstat bs);
 typedef struct
   {
     enum exception_event_kind kind;
-    int enable;
+    int enable_p;
   }
 args_for_catchpoint_enable;
 
@@ -723,7 +723,7 @@ insert_breakpoints (void)
 
   ALL_BREAKPOINTS_SAFE (b, temp)
   {
-    if (b->enable == permanent)
+    if (b->enable_state == bp_permanent)
       /* Permanent breakpoints cannot be inserted or removed.  */
       continue;
     else if (b->type != bp_watchpoint
@@ -735,9 +735,9 @@ insert_breakpoints (void)
 	&& b->type != bp_catch_exec
 	&& b->type != bp_catch_throw
 	&& b->type != bp_catch_catch
-	&& b->enable != disabled
-	&& b->enable != shlib_disabled
-	&& b->enable != call_disabled
+	&& b->enable_state != bp_disabled
+	&& b->enable_state != bp_shlib_disabled
+	&& b->enable_state != bp_call_disabled
 	&& !b->inserted
 	&& !b->duplicate)
       {
@@ -776,7 +776,7 @@ insert_breakpoints (void)
 	      {
 		/* See also: disable_breakpoints_in_shlibs. */
 		val = 0;
-		b->enable = shlib_disabled;
+		b->enable_state = bp_shlib_disabled;
 		if (!disabled_breaks)
 		  {
 		    target_terminal_ours_for_output ();
@@ -804,9 +804,9 @@ insert_breakpoints (void)
 	  return_val = val;	/* remember failure */
       }
     else if (ep_is_exception_catchpoint (b)
-	     && b->enable != disabled
-	     && b->enable != shlib_disabled
-	     && b->enable != call_disabled
+	     && b->enable_state != bp_disabled
+	     && b->enable_state != bp_shlib_disabled
+	     && b->enable_state != bp_call_disabled
 	     && !b->inserted
 	     && !b->duplicate)
 
@@ -824,7 +824,7 @@ insert_breakpoints (void)
 	    target_terminal_ours_for_output ();
 	    warning ("Cannot insert catchpoint %d; disabling it.",
 		     b->number);
-	    b->enable = disabled;
+	    b->enable_state = bp_disabled;
 	  }
 	else
 	  {
@@ -833,7 +833,7 @@ insert_breakpoints (void)
 	    args_for_catchpoint_enable args;
 	    args.kind = b->type == bp_catch_catch ? 
 	      EX_EVENT_CATCH : EX_EVENT_THROW;
-	    args.enable = 1;
+	    args.enable_p = 1;
 	    val = catch_errors (cover_target_enable_exception_callback,
 				&args,
 				message, RETURN_MASK_ALL);
@@ -848,7 +848,7 @@ insert_breakpoints (void)
 		target_terminal_ours_for_output ();
 		warning ("Cannot insert catchpoint %d; disabling it.",
 			 b->number);
-		b->enable = disabled;
+		b->enable_state = bp_disabled;
 	      }
 	  }
 
@@ -859,8 +859,8 @@ insert_breakpoints (void)
     else if ((b->type == bp_hardware_watchpoint ||
 	      b->type == bp_read_watchpoint ||
 	      b->type == bp_access_watchpoint)
-	     && b->enable == enabled
-	     && b->disposition != del_at_next_stop
+	     && b->enable_state == bp_enabled
+	     && b->disposition != disp_del_at_next_stop
 	     && !b->inserted
 	     && !b->duplicate)
       {
@@ -967,8 +967,8 @@ insert_breakpoints (void)
 	    printf_filtered ("because the program has left the block \n");
 	    printf_filtered ("in which its expression is valid.\n");
 	    if (b->related_breakpoint)
-	      b->related_breakpoint->disposition = del_at_next_stop;
-	    b->disposition = del_at_next_stop;
+	      b->related_breakpoint->disposition = disp_del_at_next_stop;
+	    b->disposition = disp_del_at_next_stop;
 	  }
 
 	/* Restore the frame and level.  */
@@ -982,7 +982,7 @@ insert_breakpoints (void)
     else if ((b->type == bp_catch_fork
 	      || b->type == bp_catch_vfork
 	      || b->type == bp_catch_exec)
-	     && b->enable == enabled
+	     && b->enable_state == bp_enabled
 	     && !b->inserted
 	     && !b->duplicate)
       {
@@ -1251,7 +1251,7 @@ remove_breakpoint (struct breakpoint *b, insertion_state_t is)
 {
   int val;
 
-  if (b->enable == permanent)
+  if (b->enable_state == bp_permanent)
     /* Permanent breakpoints cannot be inserted or removed.  */
     return 0;
 
@@ -1303,7 +1303,7 @@ remove_breakpoint (struct breakpoint *b, insertion_state_t is)
   else if ((b->type == bp_hardware_watchpoint ||
 	    b->type == bp_read_watchpoint ||
 	    b->type == bp_access_watchpoint)
-	   && b->enable == enabled
+	   && b->enable_state == bp_enabled
 	   && !b->duplicate)
     {
       value_ptr v, n;
@@ -1358,7 +1358,7 @@ remove_breakpoint (struct breakpoint *b, insertion_state_t is)
   else if ((b->type == bp_catch_fork ||
 	    b->type == bp_catch_vfork ||
 	    b->type == bp_catch_exec)
-	   && b->enable == enabled
+	   && b->enable_state == bp_enabled
 	   && !b->duplicate)
     {
       val = -1;
@@ -1383,7 +1383,7 @@ remove_breakpoint (struct breakpoint *b, insertion_state_t is)
     }
   else if ((b->type == bp_catch_catch ||
 	    b->type == bp_catch_throw)
-	   && b->enable == enabled
+	   && b->enable_state == bp_enabled
 	   && !b->duplicate)
     {
 
@@ -1394,7 +1394,7 @@ remove_breakpoint (struct breakpoint *b, insertion_state_t is)
     }
   else if (ep_is_exception_catchpoint (b)
 	   && b->inserted	/* sometimes previous insert doesn't happen */
-	   && b->enable == enabled
+	   && b->enable_state == bp_enabled
 	   && !b->duplicate)
     {
 
@@ -1505,15 +1505,15 @@ breakpoint_here_p (CORE_ADDR pc)
   int any_breakpoint_here = 0;
 
   ALL_BREAKPOINTS (b)
-    if ((b->enable == enabled
-	 || b->enable == permanent)
+    if ((b->enable_state == bp_enabled
+	 || b->enable_state == bp_permanent)
 	&& b->address == pc)	/* bp is enabled and matches pc */
       {
 	if (overlay_debugging &&
 	    section_is_overlay (b->section) &&
 	    !section_is_mapped (b->section))
 	  continue;		/* unmapped overlay -- can't be a match */
-	else if (b->enable == permanent)
+	else if (b->enable_state == bp_permanent)
 	  return permanent_breakpoint_here;
 	else
 	  any_breakpoint_here = 1;
@@ -1591,9 +1591,9 @@ breakpoint_thread_match (CORE_ADDR pc, ptid_t ptid)
   thread = pid_to_thread_id (ptid);
 
   ALL_BREAKPOINTS (b)
-    if (b->enable != disabled
-	&& b->enable != shlib_disabled
-	&& b->enable != call_disabled
+    if (b->enable_state != bp_disabled
+	&& b->enable_state != bp_shlib_disabled
+	&& b->enable_state != bp_call_disabled
 	&& b->address == pc
 	&& (b->thread == -1 || b->thread == thread))
     {
@@ -2368,8 +2368,8 @@ which its expression is valid.\n", bs->breakpoint_at->number);
 #endif 
 
       if (b->related_breakpoint)
-	b->related_breakpoint->disposition = del_at_next_stop;
-      b->disposition = del_at_next_stop;
+	b->related_breakpoint->disposition = disp_del_at_next_stop;
+      b->disposition = disp_del_at_next_stop;
 
       return WP_DELETED;
     }
@@ -2421,9 +2421,9 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint)
 
   ALL_BREAKPOINTS_SAFE (b, temp)
   {
-    if (b->enable == disabled
-	|| b->enable == shlib_disabled
-	|| b->enable == call_disabled)
+    if (b->enable_state == bp_disabled
+	|| b->enable_state == bp_shlib_disabled
+	|| b->enable_state == bp_call_disabled)
       continue;
 
     if (b->type != bp_watchpoint
@@ -2530,8 +2530,8 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint)
 	    /* Error from catch_errors.  */
 	    printf_filtered ("Watchpoint %d deleted.\n", b->number);
 	    if (b->related_breakpoint)
-	      b->related_breakpoint->disposition = del_at_next_stop;
-	    b->disposition = del_at_next_stop;
+	      b->related_breakpoint->disposition = disp_del_at_next_stop;
+	    b->disposition = disp_del_at_next_stop;
 	    /* We've already printed what needs to be printed.  */
 	    bs->print_it = print_it_done;
 
@@ -2602,8 +2602,8 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint)
 	      /* Error from catch_errors.  */
 	      printf_filtered ("Watchpoint %d deleted.\n", b->number);
 	      if (b->related_breakpoint)
-		b->related_breakpoint->disposition = del_at_next_stop;
-	      b->disposition = del_at_next_stop;
+		b->related_breakpoint->disposition = disp_del_at_next_stop;
+	      b->disposition = disp_del_at_next_stop;
 	      /* We've already printed what needs to be printed.  */
 	      bs->print_it = print_it_done;
 	      break;
@@ -2662,8 +2662,8 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint)
 	else
 	  {
 	    /* We will stop here */
-	    if (b->disposition == disable)
-	      b->enable = disabled;
+	    if (b->disposition == disp_disable)
+	      b->enable_state = bp_disabled;
 	    bs->commands = b->commands;
 	    if (b->silent)
 	      bs->print = 0;
@@ -3004,7 +3004,7 @@ bpstat_should_step (void)
 {
   struct breakpoint *b;
   ALL_BREAKPOINTS (b)
-    if (b->enable == enabled && b->type == bp_watchpoint)
+    if (b->enable_state == bp_enabled && b->type == bp_watchpoint)
       return 1;
   return 0;
 }
@@ -3015,7 +3015,7 @@ bpstat_have_active_hw_watchpoints (void)
 {
   struct breakpoint *b;
   ALL_BREAKPOINTS (b)
-    if ((b->enable == enabled) &&
+    if ((b->enable_state == bp_enabled) &&
 	(b->inserted) &&
 	((b->type == bp_hardware_watchpoint) ||
 	 (b->type == bp_read_watchpoint) ||
@@ -3174,10 +3174,10 @@ print_one_breakpoint (struct breakpoint *b,
   /* 4 */
   annotate_field (3);
 #ifdef UI_OUT
-  ui_out_field_fmt (uiout, "enabled", "%c", bpenables[(int) b->enable]);
+  ui_out_field_fmt (uiout, "enabled", "%c", bpenables[(int) b->enable_state]);
   ui_out_spaces (uiout, 2);
 #else
-  printf_filtered ("%-3c ", bpenables[(int) b->enable]);
+  printf_filtered ("%-3c ", bpenables[(int) b->enable_state]);
 #endif
   
   /* 5 and 6 */
@@ -3749,10 +3749,10 @@ describe_other_breakpoints (CORE_ADDR pc, asection *section)
 	    others--;
 	    printf_filtered ("%d%s%s ",
 			     b->number,
-			     ((b->enable == disabled || 
-			       b->enable == shlib_disabled || 
-			       b->enable == call_disabled) ? " (disabled)" 
-			      : b->enable == permanent ? " (permanent)"
+			     ((b->enable_state == bp_disabled || 
+			       b->enable_state == bp_shlib_disabled || 
+			       b->enable_state == bp_call_disabled) ? " (disabled)" 
+			      : b->enable_state == bp_permanent ? " (permanent)"
 			      : ""),
 			     (others > 1) ? "," 
 			     : ((others == 1) ? " and" : ""));
@@ -3829,15 +3829,15 @@ check_duplicates (struct breakpoint *bpt)
     return;
 
   ALL_BREAKPOINTS (b)
-    if (b->enable != disabled
-	&& b->enable != shlib_disabled
-	&& b->enable != call_disabled
+    if (b->enable_state != bp_disabled
+	&& b->enable_state != bp_shlib_disabled
+	&& b->enable_state != bp_call_disabled
 	&& b->address == address
 	&& (overlay_debugging == 0 || b->section == section)
 	&& breakpoint_address_is_meaningful (b))
     {
       /* Have we found a permanent breakpoint?  */
-      if (b->enable == permanent)
+      if (b->enable_state == bp_permanent)
 	{
 	  perm_bp = b;
 	  break;
@@ -3868,9 +3868,9 @@ check_duplicates (struct breakpoint *bpt)
 			      "another breakpoint was inserted on top of "
 			      "a permanent breakpoint");
 
-	    if (b->enable != disabled
-		&& b->enable != shlib_disabled
-		&& b->enable != call_disabled
+	    if (b->enable_state != bp_disabled
+		&& b->enable_state != bp_shlib_disabled
+		&& b->enable_state != bp_call_disabled
 		&& b->address == address
 		&& (overlay_debugging == 0 || b->section == section)
 		&& breakpoint_address_is_meaningful (b))
@@ -3913,7 +3913,7 @@ set_raw_breakpoint (struct symtab_and_line sal, enum bptype bptype)
   b->input_radix = input_radix;
   b->thread = -1;
   b->line_number = sal.line;
-  b->enable = enabled;
+  b->enable_state = bp_enabled;
   b->next = 0;
   b->silent = 0;
   b->ignore_count = 0;
@@ -3950,7 +3950,7 @@ set_raw_breakpoint (struct symtab_and_line sal, enum bptype bptype)
 void
 make_breakpoint_permanent (struct breakpoint *b)
 {
-  b->enable = permanent;
+  b->enable_state = bp_permanent;
 
   /* By definition, permanent breakpoints are already present in the code.  */
   b->inserted = 1;
@@ -3980,8 +3980,8 @@ create_longjmp_breakpoint (char *func_name)
   b = set_raw_breakpoint (sal,
                           func_name != NULL ? bp_longjmp : bp_longjmp_resume);
 
-  b->disposition = donttouch;
-  b->enable = disabled;
+  b->disposition = disp_donttouch;
+  b->enable_state = bp_disabled;
   b->silent = 1;
   if (func_name)
     b->addr_string = xstrdup (func_name);
@@ -4002,7 +4002,7 @@ enable_longjmp_breakpoint (void)
   ALL_BREAKPOINTS (b)
     if (b->type == bp_longjmp)
     {
-      b->enable = enabled;
+      b->enable_state = bp_enabled;
       check_duplicates (b);
     }
 }
@@ -4016,7 +4016,7 @@ disable_longjmp_breakpoint (void)
     if (b->type == bp_longjmp
 	|| b->type == bp_longjmp_resume)
     {
-      b->enable = disabled;
+      b->enable_state = bp_disabled;
       check_duplicates (b);
     }
 }
@@ -4034,8 +4034,8 @@ create_thread_event_breakpoint (CORE_ADDR address)
   b = set_raw_breakpoint (sal, bp_thread_event);
   
   b->number = internal_breakpoint_number--;
-  b->disposition = donttouch;
-  b->enable = enabled;
+  b->disposition = disp_donttouch;
+  b->enable_state = bp_enabled;
   /* addr_string has to be used or breakpoint_re_set will delete me.  */
   sprintf (addr_string, "*0x%s", paddr (b->address));
   b->addr_string = xstrdup (addr_string);
@@ -4075,7 +4075,7 @@ create_solib_event_breakpoint (CORE_ADDR address)
   sal.section = find_pc_overlay (sal.pc);
   b = set_raw_breakpoint (sal, bp_shlib_event);
   b->number = internal_breakpoint_number--;
-  b->disposition = donttouch;
+  b->disposition = disp_donttouch;
 
   return b;
 }
@@ -4095,11 +4095,11 @@ disable_breakpoints_in_shlibs (int silent)
 #if defined (PC_SOLIB)
     if (((b->type == bp_breakpoint) ||
 	 (b->type == bp_hardware_breakpoint)) &&
-	b->enable == enabled &&
+	b->enable_state == bp_enabled &&
 	!b->duplicate &&
 	PC_SOLIB (b->address))
       {
-	b->enable = shlib_disabled;
+	b->enable_state = bp_shlib_disabled;
 	if (!silent)
 	  {
 	    if (!disabled_shlib_breaks)
@@ -4122,14 +4122,14 @@ re_enable_breakpoints_in_shlibs (void)
   struct breakpoint *b;
 
   ALL_BREAKPOINTS (b)
-    if (b->enable == shlib_disabled)
+    if (b->enable_state == bp_shlib_disabled)
     {
       char buf[1];
 
       /* Do not reenable the breakpoint if the shared library
          is still not mapped in.  */
       if (target_read_memory (b->address, buf, 1) == 0)
-	b->enable = enabled;
+	b->enable_state = bp_enabled;
     }
 }
 
@@ -4196,8 +4196,8 @@ solib_load_unload_1 (char *hookname, int tempflag, char *dll_pathname,
   else if (addr_start)
     b->addr_string = savestring (addr_start, addr_end - addr_start);
 
-  b->enable = enabled;
-  b->disposition = tempflag ? del : donttouch;
+  b->enable_state = bp_enabled;
+  b->disposition = tempflag ? disp_del : disp_donttouch;
 
   if (dll_pathname == NULL)
     b->dll_pathname = NULL;
@@ -4248,8 +4248,8 @@ create_fork_vfork_event_catchpoint (int tempflag, char *cond_string,
     NULL : savestring (cond_string, strlen (cond_string));
   b->thread = thread;
   b->addr_string = NULL;
-  b->enable = enabled;
-  b->disposition = tempflag ? del : donttouch;
+  b->enable_state = bp_enabled;
+  b->disposition = tempflag ? disp_del : disp_donttouch;
   b->forked_inferior_pid = 0;
 
   mention (b);
@@ -4287,8 +4287,8 @@ create_exec_event_catchpoint (int tempflag, char *cond_string)
     NULL : savestring (cond_string, strlen (cond_string));
   b->thread = thread;
   b->addr_string = NULL;
-  b->enable = enabled;
-  b->disposition = tempflag ? del : donttouch;
+  b->enable_state = bp_enabled;
+  b->disposition = tempflag ? disp_del : disp_donttouch;
 
   mention (b);
 }
@@ -4301,7 +4301,7 @@ hw_breakpoint_used_count (void)
 
   ALL_BREAKPOINTS (b)
   {
-    if (b->type == bp_hardware_breakpoint && b->enable == enabled)
+    if (b->type == bp_hardware_breakpoint && b->enable_state == bp_enabled)
       i++;
   }
 
@@ -4317,14 +4317,14 @@ hw_watchpoint_used_count (enum bptype type, int *other_type_used)
   *other_type_used = 0;
   ALL_BREAKPOINTS (b)
   {
-    if (b->enable == enabled)
+    if (b->enable_state == bp_enabled)
       {
 	if (b->type == type)
 	  i++;
 	else if ((b->type == bp_hardware_watchpoint ||
 		  b->type == bp_read_watchpoint ||
 		  b->type == bp_access_watchpoint)
-		 && b->enable == enabled)
+		 && b->enable_state == bp_enabled)
 	  *other_type_used = 1;
       }
   }
@@ -4346,7 +4346,7 @@ set_longjmp_resume_breakpoint (CORE_ADDR pc, struct frame_info *frame)
     if (b->type == bp_longjmp_resume)
     {
       b->address = pc;
-      b->enable = enabled;
+      b->enable_state = bp_enabled;
       if (frame != NULL)
 	b->frame = frame->frame;
       else
@@ -4368,9 +4368,9 @@ disable_watchpoints_before_interactive_call_start (void)
 	 || (b->type == bp_read_watchpoint)
 	 || (b->type == bp_access_watchpoint)
 	 || ep_is_exception_catchpoint (b))
-	&& (b->enable == enabled))
+	&& (b->enable_state == bp_enabled))
       {
-	b->enable = call_disabled;
+	b->enable_state = bp_call_disabled;
 	check_duplicates (b);
       }
   }
@@ -4388,9 +4388,9 @@ enable_watchpoints_after_interactive_call_stop (void)
 	 || (b->type == bp_read_watchpoint)
 	 || (b->type == bp_access_watchpoint)
 	 || ep_is_exception_catchpoint (b))
-	&& (b->enable == call_disabled))
+	&& (b->enable_state == bp_call_disabled))
       {
-	b->enable = enabled;
+	b->enable_state = bp_enabled;
 	check_duplicates (b);
       }
   }
@@ -4407,8 +4407,8 @@ set_momentary_breakpoint (struct symtab_and_line sal, struct frame_info *frame,
 {
   register struct breakpoint *b;
   b = set_raw_breakpoint (sal, type);
-  b->enable = enabled;
-  b->disposition = donttouch;
+  b->enable_state = bp_enabled;
+  b->disposition = disp_donttouch;
   b->frame = (frame ? frame->frame : 0);
 
   /* If we're debugging a multi-threaded program, then we
@@ -4636,7 +4636,7 @@ create_breakpoints (struct symtabs_and_lines sals, char **addr_string,
 	b->addr_string = addr_string[i];
 	b->cond_string = cond_string[i];
 	b->ignore_count = ignore_count;
-	b->enable = enabled;
+	b->enable_state = bp_enabled;
 	b->disposition = disposition;
 	mention (b);
       }
@@ -4861,7 +4861,7 @@ break_command_1 (char *arg, int flag, int from_tty)
 
   create_breakpoints (sals, addr_string, cond, cond_string,
 		      hardwareflag ? bp_hardware_breakpoint : bp_breakpoint,
-		      tempflag ? del : donttouch,
+		      tempflag ? disp_del : disp_donttouch,
 		      thread, ignore_count, from_tty);
 
   if (sals.nelts > 1)
@@ -4973,7 +4973,7 @@ do_captured_breakpoint (void *data)
 
   create_breakpoints (sals, addr_string, cond, cond_string,
 		      args->hardwareflag ? bp_hardware_breakpoint : bp_breakpoint,
-		      args->tempflag ? del : donttouch,
+		      args->tempflag ? disp_del : disp_donttouch,
 		      args->thread, args->ignore_count, 0/*from-tty*/);
 
   /* That's it. Discard the cleanups for data inserted into the
@@ -5439,7 +5439,7 @@ watch_command_1 (char *arg, int accessflag, int from_tty)
   b = set_raw_breakpoint (sal, bp_type);
   set_breakpoint_count (breakpoint_count + 1);
   b->number = breakpoint_count;
-  b->disposition = donttouch;
+  b->disposition = disp_donttouch;
   b->exp = exp;
   b->exp_valid_block = exp_valid_block;
   b->exp_string = savestring (exp_start, exp_end - exp_start);
@@ -5478,10 +5478,10 @@ watch_command_1 (char *arg, int accessflag, int from_tty)
 	  set_breakpoint_count (breakpoint_count + 1);
 	  scope_breakpoint->number = breakpoint_count;
 
-	  scope_breakpoint->enable = enabled;
+	  scope_breakpoint->enable_state = bp_enabled;
 
 	  /* Automatically delete the breakpoint when it hits.  */
-	  scope_breakpoint->disposition = del;
+	  scope_breakpoint->disposition = disp_del;
 
 	  /* Only break in the proper frame (help with recursion).  */
 	  scope_breakpoint->frame = prev_frame->frame;
@@ -6232,8 +6232,8 @@ create_exception_catchpoint (int tempflag, char *cond_string,
     NULL : savestring (cond_string, strlen (cond_string));
   b->thread = thread;
   b->addr_string = NULL;
-  b->enable = enabled;
-  b->disposition = tempflag ? del : donttouch;
+  b->enable_state = bp_enabled;
+  b->disposition = tempflag ? disp_del : disp_donttouch;
   mention (b);
 }
 
@@ -6296,7 +6296,7 @@ cover_target_enable_exception_callback (PTR arg)
 {
   args_for_catchpoint_enable *args = arg;
   struct symtab_and_line *sal;
-  sal = target_enable_exception_callback (args->kind, args->enable);
+  sal = target_enable_exception_callback (args->kind, args->enable_p);
   if (sal == NULL)
     return 0;
   else if (sal == (struct symtab_and_line *) -1)
@@ -6396,8 +6396,8 @@ handle_gnu_4_16_catch_command (char *arg, int tempflag, int from_tty)
       b->number = breakpoint_count;
 
       b->cond = cond;
-      b->enable = enabled;
-      b->disposition = tempflag ? del : donttouch;
+      b->enable_state = bp_enabled;
+      b->disposition = tempflag ? disp_del : disp_donttouch;
 
       mention (b);
     }
@@ -6426,8 +6426,8 @@ create_temp_exception_breakpoint (CORE_ADDR pc)
 
   b = set_raw_breakpoint (sal, bp_breakpoint);
 
-  b->disposition = del;
-  b->enable = enabled;
+  b->disposition = disp_del;
+  b->enable_state = bp_enabled;
   b->silent = 1;
   b->number = internal_breakpoint_number--;
   return b;
@@ -6751,13 +6751,13 @@ breakpoint_auto_delete (bpstat bs)
   struct breakpoint *b, *temp;
 
   for (; bs; bs = bs->next)
-    if (bs->breakpoint_at && bs->breakpoint_at->disposition == del
+    if (bs->breakpoint_at && bs->breakpoint_at->disposition == disp_del
 	&& bs->stop)
       delete_breakpoint (bs->breakpoint_at);
 
   ALL_BREAKPOINTS_SAFE (b, temp)
   {
-    if (b->disposition == del_at_next_stop)
+    if (b->disposition == disp_del_at_next_stop)
       delete_breakpoint (b);
   }
 }
@@ -6817,7 +6817,7 @@ delete_breakpoint (struct breakpoint *bpt)
       sprintf (message, message1, bpt->number);
       args.kind = bpt->type == bp_catch_catch ? 
 	EX_EVENT_CATCH : EX_EVENT_THROW;
-      args.enable = 0;
+      args.enable_p = 0;
       catch_errors (cover_target_enable_exception_callback, &args,
 		    message, RETURN_MASK_ALL);
     }
@@ -6845,9 +6845,9 @@ delete_breakpoint (struct breakpoint *bpt)
 	if (b->address == bpt->address
 	    && b->section == bpt->section
 	    && !b->duplicate
-	    && b->enable != disabled
-	    && b->enable != shlib_disabled
-	    && b->enable != call_disabled)
+	    && b->enable_state != bp_disabled
+	    && b->enable_state != bp_shlib_disabled
+	    && b->enable_state != bp_call_disabled)
 	{
 	  int val;
 
@@ -6855,7 +6855,7 @@ delete_breakpoint (struct breakpoint *bpt)
 	     breakpoint at the same address as the one being deleted.
 	     If there is a permanent breakpoint somewhere, it should
 	     always be the only one inserted.  */
-	  if (b->enable == permanent)
+	  if (b->enable_state == bp_permanent)
 	    internal_error (__FILE__, __LINE__,
 			    "another breakpoint was inserted on top of "
 			    "a permanent breakpoint");
@@ -6991,7 +6991,7 @@ breakpoint_re_set_one (PTR bint)
   int i;
   struct symtabs_and_lines sals;
   char *s;
-  enum enable save_enable;
+  enum enable_state save_enable;
 
   switch (b->type)
     {
@@ -7011,8 +7011,8 @@ breakpoint_re_set_one (PTR bint)
 	}
       /* In case we have a problem, disable this breakpoint.  We'll restore
          its status if we succeed.  */
-      save_enable = b->enable;
-      b->enable = disabled;
+      save_enable = b->enable_state;
+      b->enable_state = bp_disabled;
 
       set_language (b->language);
       input_radix = b->input_radix;
@@ -7068,7 +7068,7 @@ breakpoint_re_set_one (PTR bint)
 	      breakpoints_changed ();
 	    }
 	  b->section = sals.sals[i].section;
-	  b->enable = save_enable;	/* Restore it, this worked. */
+	  b->enable_state = save_enable;	/* Restore it, this worked. */
 
 
 	  /* Now that this is re-enabled, check_duplicates
@@ -7112,7 +7112,7 @@ breakpoint_re_set_one (PTR bint)
 	    xfree (b->cond);
 	  b->cond = parse_exp_1 (&s, (struct block *) 0, 0);
 	}
-      if (b->enable == enabled)
+      if (b->enable_state == bp_enabled)
 	mention (b);
       value_free_to_mark (mark);
       break;
@@ -7333,10 +7333,10 @@ disable_breakpoint (struct breakpoint *bpt)
     return;
 
   /* You can't disable permanent breakpoints.  */
-  if (bpt->enable == permanent)
+  if (bpt->enable_state == bp_permanent)
     return;
 
-  bpt->enable = disabled;
+  bpt->enable_state = bp_disabled;
 
   check_duplicates (bpt);
 
@@ -7400,8 +7400,8 @@ do_enable_breakpoint (struct breakpoint *bpt, enum bpdisp disposition)
 	error ("Hardware breakpoints used exceeds limit.");
     }
 
-  if (bpt->enable != permanent)
-    bpt->enable = enabled;
+  if (bpt->enable_state != bp_permanent)
+    bpt->enable_state = bp_enabled;
   bpt->disposition = disposition;
   check_duplicates (bpt);
   breakpoints_changed ();
@@ -7425,7 +7425,7 @@ do_enable_breakpoint (struct breakpoint *bpt, enum bpdisp disposition)
 	      printf_filtered ("\
 Cannot enable watchpoint %d because the block in which its expression\n\
 is valid is not currently in scope.\n", bpt->number);
-	      bpt->enable = disabled;
+	      bpt->enable_state = bp_disabled;
 	      return;
 	    }
 
@@ -7459,7 +7459,7 @@ is valid is not currently in scope.\n", bpt->number);
 	      printf_filtered ("\
 Cannot enable watchpoint %d because target watch resources\n\
 have been allocated for other watchpoints.\n", bpt->number);
-	      bpt->enable = disabled;
+	      bpt->enable_state = bp_disabled;
 	      value_free_to_mark (mark);
 	      return;
 	    }
@@ -7521,7 +7521,7 @@ enable_command (char *args, int from_tty)
 static void
 enable_once_breakpoint (struct breakpoint *bpt)
 {
-  do_enable_breakpoint (bpt, disable);
+  do_enable_breakpoint (bpt, disp_disable);
 }
 
 /* ARGSUSED */
@@ -7534,7 +7534,7 @@ enable_once_command (char *args, int from_tty)
 static void
 enable_delete_breakpoint (struct breakpoint *bpt)
 {
-  do_enable_breakpoint (bpt, del);
+  do_enable_breakpoint (bpt, disp_del);
 }
 
 /* ARGSUSED */
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 1ef4a799e58..0909c3a8993 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -133,21 +133,21 @@ enum bptype
 
 /* States of enablement of breakpoint. */
 
-enum enable
+enum enable_state
   {
-    disabled,		/* The eventpoint is inactive, and cannot trigger. */
-    enabled,		/* The eventpoint is active, and can trigger. */
-    shlib_disabled,	/* The eventpoint's address is in an unloaded solib.
+    bp_disabled,	/* The eventpoint is inactive, and cannot trigger. */
+    bp_enabled,		/* The eventpoint is active, and can trigger. */
+    bp_shlib_disabled,	/* The eventpoint's address is in an unloaded solib.
 			   The eventpoint will be automatically enabled 
 			   and reset when that solib is loaded. */
-    call_disabled,	/* The eventpoint has been disabled while a call 
+    bp_call_disabled,	/* The eventpoint has been disabled while a call 
 			   into the inferior is "in flight", because some 
 			   eventpoints interfere with the implementation of 
 			   a call on some targets.  The eventpoint will be 
 			   automatically enabled and reset when the call 
 			   "lands" (either completes, or stops at another 
 			   eventpoint). */
-    permanent		/* There is a breakpoint instruction hard-wired into
+    bp_permanent	/* There is a breakpoint instruction hard-wired into
 			   the target's code.  Don't try to write another
 			   breakpoint instruction on top of it, or restore
 			   its value.  Step over it using the architecture's
@@ -159,10 +159,10 @@ enum enable
 
 enum bpdisp
   {
-    del,			/* Delete it */
-    del_at_next_stop,		/* Delete at next stop, whether hit or not */
-    disable,			/* Disable it */
-    donttouch			/* Leave it alone */
+    disp_del,			/* Delete it */
+    disp_del_at_next_stop,	/* Delete at next stop, whether hit or not */
+    disp_disable,		/* Disable it */
+    disp_donttouch		/* Leave it alone */
   };
 
 enum target_hw_bp_type
@@ -187,7 +187,7 @@ struct breakpoint
     /* Type of breakpoint. */
     enum bptype type;
     /* Zero means disabled; remember the info but don't break here.  */
-    enum enable enable;
+    enum enable_state enable_state;
     /* What to do with this breakpoint after we hit it. */
     enum bpdisp disposition;
     /* Number assigned to distinguish breakpoints.  */
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 2cf3e29379f..4805340ae58 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -41,10 +41,7 @@
 #include <unistd.h>
 #include <sys/utsname.h>
 #include <io.h>
-/* breakpoint.h defines `disable' which is an enum member.  */
-#define disable interrup_disable
 #include <dos.h>
-#undef disable
 #include <dpmi.h>
 #include <go32.h>
 #include <sys/farptr.h>
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 3f8572ed323..5229fe1d514 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -894,7 +894,7 @@ run_stack_dummy (CORE_ADDR addr, char *buffer)
       bpt = set_momentary_breakpoint (sal,
 				      get_current_frame (),
 				      bp_call_dummy);
-      bpt->disposition = del;
+      bpt->disposition = disp_del;
 
       /* If all error()s out of proceed ended up calling normal_stop (and
          perhaps they should; it already does in the special case of error
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 10637fc6076..9dd3dd5065c 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -27,16 +27,6 @@
 #include "language.h"
 #include "gdb_string.h"
 
-/* FIXME: While this conflicts with the enum defined in breakpoint.h,
-   I used them to be consistant with how breakpoints, tracepoints, and
-   displays are implemented.  It doesn't lose now because breakpoint.h
-   is not included.  */
-enum enable
-{
-  disabled,
-  enabled
-};
-
 const struct mem_attrib default_mem_attrib =
 {
   MEM_RW,			/* mode */
@@ -78,7 +68,7 @@ create_mem_region (CORE_ADDR lo, CORE_ADDR hi,
   new->lo = lo;
   new->hi = hi;
   new->number = ++mem_number;
-  new->status = enabled;
+  new->enabled_p = 1;
   new->attrib = *attrib;
 
   /* link in new node */
@@ -117,7 +107,7 @@ lookup_mem_region (CORE_ADDR addr)
 
   for (m = mem_region_chain; m; m = m->next)
     {
-      if (m->status == enabled)
+      if (m->enabled_p == 1)
 	{
 	  if (addr >= m->lo && addr < m->hi)
 	    return m;
@@ -245,7 +235,7 @@ mem_info_command (char *args, int from_tty)
       char *tmp;
       printf_filtered ("%-3d %-3c\t",
 		       m->number,
-		       m->status ? 'y' : 'n');
+		       m->enabled_p ? 'y' : 'n');
       if (TARGET_ADDR_BIT <= 32)
 	tmp = longest_local_hex_string_custom ((unsigned long) m->lo, "08l");
       else
@@ -340,7 +330,7 @@ mem_enable (int num)
   for (m = mem_region_chain; m; m = m->next)
     if (m->number == num)
       {
-	m->status = enabled;
+	m->enabled_p = 1;
 	return;
       }
   printf_unfiltered ("No memory region number %d.\n", num);
@@ -359,7 +349,7 @@ mem_enable_command (char *args, int from_tty)
   if (p == 0)
     {
       for (m = mem_region_chain; m; m = m->next)
-	m->status = enabled;
+	m->enabled_p = 1;
     }
   else
     while (*p)
@@ -390,7 +380,7 @@ mem_disable (int num)
   for (m = mem_region_chain; m; m = m->next)
     if (m->number == num)
       {
-	m->status = disabled;
+	m->enabled_p = 0;
 	return;
       }
   printf_unfiltered ("No memory region number %d.\n", num);
@@ -409,7 +399,7 @@ mem_disable_command (char *args, int from_tty)
   if (p == 0)
     {
       for (m = mem_region_chain; m; m = m->next)
-	m->status = disabled;
+	m->enabled_p = 0;
     }
   else
     while (*p)
diff --git a/gdb/memattr.h b/gdb/memattr.h
index 6796b713427..8643a23cec8 100644
--- a/gdb/memattr.h
+++ b/gdb/memattr.h
@@ -79,8 +79,8 @@ struct mem_region
   /* Item number of this memory region. */
   int number;
 
-  /* Status of this memory region (enabled or disabled) */
-  int status;
+  /* Status of this memory region (enabled if non-zero, otherwise disabled) */
+  int enabled_p;
 
   /* Attributes for this region */
   struct mem_attrib attrib;
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index ec77715ca40..ca2979be066 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -112,7 +112,7 @@ struct display
     /* Innermost block required by this expression when evaluated */
     struct block *block;
     /* Status of this display (enabled or disabled) */
-    enum enable status;
+    int enabled_p;
   };
 
 /* Chain of expressions whose values should be displayed
@@ -1433,7 +1433,7 @@ display_command (char *exp, int from_tty)
       new->next = display_chain;
       new->number = ++display_number;
       new->format = fmt;
-      new->status = enabled;
+      new->enabled_p = 1;
       display_chain = new;
 
       if (from_tty && target_has_execution)
@@ -1544,7 +1544,7 @@ do_one_display (struct display *d)
 {
   int within_current_scope;
 
-  if (d->status == disabled)
+  if (d->enabled_p == 0)
     return;
 
   if (d->block)
@@ -1644,7 +1644,7 @@ disable_display (int num)
   for (d = display_chain; d; d = d->next)
     if (d->number == num)
       {
-	d->status = disabled;
+	d->enabled_p = 0;
 	return;
       }
   printf_unfiltered ("No display number %d.\n", num);
@@ -1675,7 +1675,7 @@ Num Enb Expression\n");
 
   for (d = display_chain; d; d = d->next)
     {
-      printf_filtered ("%d:   %c  ", d->number, "ny"[(int) d->status]);
+      printf_filtered ("%d:   %c  ", d->number, "ny"[(int) d->enabled_p]);
       if (d->format.size)
 	printf_filtered ("/%d%c%c ", d->format.count, d->format.size,
 			 d->format.format);
@@ -1700,7 +1700,7 @@ enable_display (char *args, int from_tty)
   if (p == 0)
     {
       for (d = display_chain; d; d = d->next)
-	d->status = enabled;
+	d->enabled_p = 1;
     }
   else
     while (*p)
@@ -1716,7 +1716,7 @@ enable_display (char *args, int from_tty)
 	for (d = display_chain; d; d = d->next)
 	  if (d->number == num)
 	    {
-	      d->status = enabled;
+	      d->enabled_p = 1;
 	      goto win;
 	    }
 	printf_unfiltered ("No display number %d.\n", num);
@@ -1738,7 +1738,7 @@ disable_display_command (char *args, int from_tty)
   if (p == 0)
     {
       for (d = display_chain; d; d = d->next)
-	d->status = disabled;
+	d->enabled_p = 0;
     }
   else
     while (*p)
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index fbe377e02a1..692c9a20e9c 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -357,7 +357,7 @@ set_raw_tracepoint (struct symtab_and_line sal)
   t->language = current_language->la_language;
   t->input_radix = input_radix;
   t->line_number = sal.line;
-  t->enabled = enabled;
+  t->enabled_p = 1;
   t->next = 0;
   t->step_count = 0;
   t->pass_count = 0;
@@ -494,7 +494,7 @@ tracepoints_info (char *tpnum_exp, int from_tty)
 	}
 
       printf_filtered ("%-3d %-3s ", t->number,
-		       t->enabled == enabled ? "y" : "n");
+		       t->enabled_p ? "y" : "n");
       if (addressprint)
 	{
 	  char *tmp;
@@ -569,11 +569,11 @@ tracepoint_operation (struct tracepoint *t, int from_tty,
   switch (opcode)
     {
     case enable_op:
-      t->enabled = enabled;
+      t->enabled_p = 1;
       tracepoint_modify_event (t->number);
       break;
     case disable_op:
-      t->enabled = disabled;
+      t->enabled_p = 0;
       tracepoint_modify_event (t->number);
       break;
     case delete_op:
@@ -1735,7 +1735,7 @@ trace_start_command (char *args, int from_tty)
 
 	sprintf_vma (tmp, t->address);
 	sprintf (buf, "QTDP:%x:%s:%c:%lx:%x", t->number, tmp, /* address */
-		 t->enabled == enabled ? 'E' : 'D',
+		 t->enabled_p ? 'E' : 'D',
 		 t->step_count, t->pass_count);
 
 	if (t->actions)
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 5bd07f458a2..c464ae1f98c 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?). */
diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 42ed3362423..7c51d2d5a0b 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-02  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* tuiSourceWin.c: Use disp_del instead of del.
+
+	* tuiSource.c: Use disp_del instead of del.
+
+	* tuiDisassem.c: Use disp_del instead of del.
+
 2001-07-31  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
 	* tui.c (tui_enable): Remove call to terminal_save_ours().
diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tuiDisassem.c
index 7bdcbf704d7..9766bbb6fb7 100644
--- a/gdb/tui/tuiDisassem.c
+++ b/gdb/tui/tuiDisassem.c
@@ -120,7 +120,7 @@ extern void strcat_address_numeric (CORE_ADDR, int, char *, int);
 	      element->whichElement.source.hasBreak =
 		(bp != (struct breakpoint *) NULL &&
 		 (!element->whichElement.source.isExecPoint ||
-		  (bp->disposition != del || bp->hit_count <= 0)));
+		  (bp->disposition != disp_del || bp->hit_count <= 0)));
 	      curLine++;
 	      pc = newpc;
 	      /* reset the buffer to empty */
diff --git a/gdb/tui/tuiSource.c b/gdb/tui/tuiSource.c
index 6c1a8fb5e11..5dc5adec7e6 100644
--- a/gdb/tui/tuiSource.c
+++ b/gdb/tui/tuiSource.c
@@ -172,7 +172,7 @@ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
 		      element->whichElement.source.hasBreak =
 			(bp != (struct breakpoint *) NULL &&
 			 (!element->whichElement.source.isExecPoint ||
-			  (bp->disposition != del || bp->hit_count <= 0)));
+			  (bp->disposition != disp_del || bp->hit_count <= 0)));
 		      if (c != EOF)
 			{
 			  i = strlen (srcLine) - 1;
diff --git a/gdb/tui/tuiSourceWin.c b/gdb/tui/tuiSourceWin.c
index b79404dc3ce..1fb0ddf2fdd 100644
--- a/gdb/tui/tuiSourceWin.c
+++ b/gdb/tui/tuiSourceWin.c
@@ -583,7 +583,7 @@ tuiSetExecInfoContent (TuiWinInfoPtr winInfo)
 			 srcElement->whichElement.source.lineOrAddr.addr);
 		      if (found)
 			srcElement->whichElement.source.hasBreak =
-			  (bp->disposition != del || bp->hit_count <= 0);
+			  (bp->disposition != disp_del || bp->hit_count <= 0);
 		    }
 		  if (!found)
 		    srcElement->whichElement.source.hasBreak = FALSE;