From d3f7ec30897868e6dbb724ff1c308b0fc7f5fe14 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mylan>
Date: Tue, 24 May 2005 21:02:42 +0200
Subject: [PATCH] simplifying new/my_arg_new wrapping

---
 include/my_global.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/my_global.h b/include/my_global.h
index f059d603976..d7cda085353 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -289,12 +289,14 @@ C_MODE_START int __cxa_pure_virtual() {\
 #endif
 #if defined(__ia64__)
 #define new my_arg_new
+#define need_to_restore_new 1
 #endif
 C_MODE_START
 #include <asm/atomic.h>
 C_MODE_END
-#if defined(__ia64__)
+#ifdef need_to_restore_new /* probably safer than #ifdef new */
 #undef new
+#undef need_to_restore_new
 #endif
 #endif
 #include <errno.h>				/* Recommended by debian */