PERFORCE change 100476 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=100476

Change 100476 by jb at jb_freebsd2 on 2006/07/03 09:38:59

	Adjust the 64-bit #ifdefs to apply to FreeBSD too.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newehdr.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newphdr.c#3 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#4 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newehdr.c#3 (text) ====

@@ -30,14 +30,14 @@
 
 #pragma ident	"@(#)newehdr.c	1.17	05/06/08 SMI"
 
+#if !defined(_ELF64)
 #if defined(sun)
-#if !defined(_ELF64)
 #pragma weak elf32_newehdr = _elf32_newehdr
-#endif
 #else
 #include <sys/cdefs.h>
 __weak_reference(_elf32_newehdr,elf32_newehdr);
 #endif
+#endif
 
 #include "syn.h"
 #include <stdlib.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newphdr.c#3 (text) ====

@@ -30,14 +30,14 @@
 
 #pragma ident	"@(#)newphdr.c	1.17	05/06/08 SMI"
 
+#if !defined(_ELF64)
 #if defined(sun)
-#if !defined(_ELF64)
 #pragma weak elf32_newphdr = _elf32_newphdr
-#endif
 #else
 #include <sys/cdefs.h>
 __weak_reference(_elf32_newphdr,elf32_newphdr);
 #endif
+#endif
 
 #include "syn.h"
 #include <stdlib.h>

==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#4 (text) ====

@@ -30,14 +30,14 @@
 
 #pragma ident	"@(#)update.c	1.26	06/03/24 SMI"
 
+#if !defined(_ELF64)
 #if defined(sun)
-#if !defined(_ELF64)
 #pragma weak elf_update = _elf_update
-#endif
 #else
 #include <sys/cdefs.h>
 __weak_reference(_elf_update,elf_update);
 #endif
+#endif
 
 #include "syn.h"
 #include <memory.h>