--- a/src/mem.h	Tue Jan 01 05:48:06 2008 +0000
+++ b/src/mem.h	Tue Jan 01 08:57:33 2008 +0000
@@ -71,25 +71,23 @@
 
 #define ENABLE_DEBUG_MODE 1
 
+typedef enum { BREAK_NONE=0, BREAK_ONESHOT=1, BREAK_KEEP=2 } breakpoint_type_t;
+
 struct breakpoint_struct {
     uint32_t address;
-    int type;
+    breakpoint_type_t type;
 };
 
 #define MAX_BREAKPOINTS 32
-#define BREAK_NONE 0
-#define BREAK_ONESHOT 1
-#define BREAK_KEEP 2
 
-#undef ENABLE_WATCH
+
+#define MEM_FLAG_ROM 4 /* Mem region is ROM-based */
+#define MEM_FLAG_RAM 6 
 
 #define WATCH_WRITE 1
 #define WATCH_READ  2
 #define WATCH_EXEC  3  /* AKA Breakpoint :) */
 
-#define MEM_FLAG_ROM 4 /* Mem region is ROM-based */
-#define MEM_FLAG_RAM 6 
-
 typedef struct watch_point *watch_point_t;
 
 watch_point_t mem_new_watch( uint32_t start, uint32_t end, int flags );