From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Mon, 1 Nov 2004 18:42:23 +0000 (+0000)
Subject: Make ESZ less public.
X-Git-Tag: svn/VALGRIND_3_0_0~1409
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd2f2803171f84ed1fbecc5b08a305621a33fa1;p=thirdparty%2Fvalgrind.git

Make ESZ less public.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2898
---

diff --git a/coregrind/ume.c b/coregrind/ume.c
index f0e02b313e..4a1362d137 100644
--- a/coregrind/ume.c
+++ b/coregrind/ume.c
@@ -46,6 +46,14 @@
 
 #include "ume.h"
 
+#if	ELFSZ == 64
+#define ESZ(x)	Elf64_##x
+#elif	ELFSZ == 32
+#define ESZ(x)	Elf32_##x
+#else
+#error ELFSZ needs to ==32 or ==64
+#endif
+
 struct elfinfo
 {
    ESZ(Ehdr)	e;
diff --git a/coregrind/ume.h b/coregrind/ume.h
index b244a93d10..4daf504b21 100644
--- a/coregrind/ume.h
+++ b/coregrind/ume.h
@@ -46,14 +46,6 @@ void foreach_map(int (*fn)(char *start, char *end,
 			   int maj, int min, int ino, void* extra),
                  void* extra);
 
-#if	ELFSZ == 64
-#define ESZ(x)	Elf64_##x
-#elif	ELFSZ == 32
-#define ESZ(x)	Elf32_##x
-#else
-#error ELFSZ needs to ==32 or ==64
-#endif
-
 // Jump to a new 'ip' with the stack 'sp'.
 void jmp_with_stack(Addr ip, Addr sp) __attribute__((noreturn));