From 32f3b19a069336de8ce15ab03ccf8b30ea2e8fce Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Fri, 21 Mar 2008 23:44:21 +0000 Subject: [PATCH] Avoid calling array_endof in a static initializer, as it incurs dynamic initialization. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48666 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Unix/Signals.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/System/Unix/Signals.inc b/lib/System/Unix/Signals.inc index ff84639f307..f7149b12a36 100644 --- a/lib/System/Unix/Signals.inc +++ b/lib/System/Unix/Signals.inc @@ -41,7 +41,7 @@ std::vector *DirectoriesToRemove = 0; const int IntSigs[] = { SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGTERM, SIGUSR1, SIGUSR2 }; -const int *IntSigsEnd = array_endof(IntSigs); +const int *IntSigsEnd = IntSigs + sizeof(IntSigs) / sizeof(IntSigs[0]); // KillSigs - Signals that are synchronous with the program that will cause it // to die. @@ -51,7 +51,7 @@ const int KillSigs[] = { , SIGEMT #endif }; -const int *KillSigsEnd = array_endof(KillSigs); +const int *KillSigsEnd = KillSigs + sizeof(KillSigs) / sizeof(KillSigs[0]); #ifdef HAVE_BACKTRACE void* StackTrace[256];