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 f0e02b313ebd36fcb7ae3fa538b64d55294fc1b7..4a1362d137ae9d3b1ddfc7094de3f250e8d64f07 100644 (file)
--- 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 b244a93d105886b1066c56ea0178248f83ec03aa..4daf504b21b0dfc0a75807e8a768dc32eaf55769 100644 (file)
--- 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));