4 files changed, 2 insertions, 7 deletions
diff --git a/gdb/config/i386/nm-i386sol2.h b/gdb/config/i386/nm-i386sol2.h
index 279c9b0..05ab066 100644
--- a/gdb/config/i386/nm-i386sol2.h
+++ b/gdb/config/i386/nm-i386sol2.h
@@ -22,9 +22,7 @@
 
 #ifdef HAVE_THREAD_DB_LIB
 
-#ifdef __STDC__
 struct objfile;
-#endif
 
 #define target_new_objfile(OBJFILE) sol_thread_new_objfile (OBJFILE)
 
diff --git a/gdb/config/i386/tm-i386.h b/gdb/config/i386/tm-i386.h
index ee9017b..0bfb2e6 100644
--- a/gdb/config/i386/tm-i386.h
+++ b/gdb/config/i386/tm-i386.h
@@ -21,11 +21,10 @@
 #ifndef TM_I386_H
 #define TM_I386_H 1
 
-#ifdef __STDC__			/* Forward decl's for prototypes */
+/* Forward decl's for prototypes */
 struct frame_info;
 struct frame_saved_regs;
 struct type;
-#endif
 
 #define TARGET_BYTE_ORDER LITTLE_ENDIAN
 
diff --git a/gdb/config/i386/tm-i386v.h b/gdb/config/i386/tm-i386v.h
index 1e6a2b2..308da1f 100644
--- a/gdb/config/i386/tm-i386v.h
+++ b/gdb/config/i386/tm-i386v.h
@@ -153,10 +153,9 @@
 #undef  FRAME_NUM_ARGS
 #define FRAME_NUM_ARGS(fi) (-1)
 
-#ifdef __STDC__			/* Forward decl's for prototypes */
+/* Forward decl's for prototypes */
 struct frame_info;
 struct frame_saved_regs;
-#endif
 
 extern int
 i386_frame_num_args PARAMS ((struct frame_info *));
diff --git a/gdb/config/i386/tm-sun386.h b/gdb/config/i386/tm-sun386.h
index 5d4c39c..a4ef54c 100644
--- a/gdb/config/i386/tm-sun386.h
+++ b/gdb/config/i386/tm-sun386.h
@@ -26,7 +26,6 @@
 #ifndef sun386
 #define sun386
 #endif
-#define GDB_TARGET_IS_SUN386 1
 #define SUNOS4
 #define USE_MACHINE_REG_H