* defs.h: Don't check for definition of LONGEST.

	(min, max): Remove duplicates.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc84e6864784a2e48303110e9ef1a4704a2227e3..05d093a5719916607b698d12b6ed5f0a738ee862 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-10  Tom Tromey  <tromey@redhat.com>
+
+       * defs.h: Don't check for definition of LONGEST.
+       (min, max): Remove duplicates.
+
 2012-12-10  Tom Tromey  <tromey@redhat.com>
 
        * dwarf2read.c (dwarf2_fetch_die_loc_sect_off): New function.

diff --git a/gdb/defs.h b/gdb/defs.h
index 369ee7a6149559337c43dd5343bbffc536d6ab66..ee49a89f06557c8d5911402103e1fdab4aaeed8c 100644 (file)
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -116,8 +116,6 @@ typedef bfd_vma CORE_ADDR;
 
 /* This is to make sure that LONGEST is at least as big as CORE_ADDR.  */
 
-#ifndef LONGEST
-
 #ifdef BFD64
 
 #define LONGEST BFD_HOST_64_BIT
@@ -130,8 +128,6 @@ typedef bfd_vma CORE_ADDR;
 
 #endif /* No BFD64 */
 
-#endif /* ! LONGEST */
-
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #endif
@@ -618,12 +614,6 @@ enum gdb_osabi
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
 
 
 #ifndef atof