[nasm:macho-unify] output: macho -- Drop OF_ ifdefs

[nasm-bot for Cyrill Gorcunov]

Commit-ID:  758ad5020ad25256ccb513392985212efcdd6c73
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=758ad5020ad25256ccb513392985212efcdd6c73
Author:     Cyrill Gorcunov <gorcunov at gmail.com>
AuthorDate: Wed, 2 May 2018 23:54:18 +0300
Committer:  Cyrill Gorcunov <gorcunov at gmail.com>
CommitDate: Wed, 9 May 2018 18:03:50 +0300

output: macho -- Drop OF_ ifdefs

We're building both anyway.

Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>


---
 output/outmacho.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/output/outmacho.c b/output/outmacho.c
index 40ff589f..cfd9d82b 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -57,8 +57,6 @@
 #include "dwarf.h"
 #include "macho.h"
 
-#if defined(OF_MACHO) || defined(OF_MACHO64)
-
 /* Mach-O in-file header structure sizes */
 #define MACHO_HEADER_SIZE		28
 #define MACHO_SEGCMD_SIZE		56
@@ -2204,7 +2202,6 @@ static void macho_dbg_cleanup(void)
     }
 }
 
-#ifdef OF_MACHO32
 static const struct macho_fmt macho32_fmt = {
     4,
     MH_MAGIC,
@@ -2265,9 +2262,7 @@ const struct ofmt of_macho32 = {
     macho_cleanup,
     macho_pragma_list
 };
-#endif
 
-#ifdef OF_MACHO64
 static const struct macho_fmt macho64_fmt = {
     8,
     MH_MAGIC_64,
@@ -2330,9 +2325,6 @@ const struct ofmt of_macho64 = {
     macho_cleanup,
     macho_pragma_list,
 };
-#endif
-
-#endif
 
 /*
  * Local Variables: