Touches most files in bfd/, so likely will be blamed for everything..

[deliverable/binutils-gdb.git] / bfd / pc532-mach.c

diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c
index 9b7fc6f88506fbf0e078539a7e33a563b9ebbb40..9161c7bdbfca3bb84141084906f7c77f14203791 100644 (file)
--- a/bfd/pc532-mach.c
+++ b/bfd/pc532-mach.c
@@ -63,8 +63,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "libbfd.h"
 #include "aout/aout64.h"
 
-/* We can`t use the MYNS macro here for cpp reasons too subtle for me -- IWD */
-
 #define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
 
 /* libaout doesn't use NAME for these ...  */
@@ -75,19 +73,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define MY_exec_header_not_counted 1
 
-#define MYNSX(OP) CAT(ns32kaout_,OP)
-reloc_howto_type *
-MYNSX(bfd_reloc_type_lookup)
-  PARAMS((bfd *abfd AND
-         bfd_reloc_code_real_type code));
+reloc_howto_type *ns32kaout_bfd_reloc_type_lookup
+  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 
-boolean
-MYNSX(write_object_contents)
-  PARAMS((bfd *abfd));
+static boolean MY(write_object_contents)
+  PARAMS ((bfd *abfd));
 
 static boolean
 MY(write_object_contents) (abfd)
-bfd *abfd;
+     bfd *abfd;
 {
   struct external_exec exec_bytes;
   struct internal_exec *execp = exec_hdr (abfd);