[llvm-commits] [llvm] r107042 - /llvm/trunk/lib/Support/PrettyStackTrace.cpp

Eric Christopher echristo at apple.com
Mon Jun 28 11:33:48 PDT 2010


Author: echristo
Date: Mon Jun 28 13:33:48 2010
New Revision: 107042

URL: http://llvm.org/viewvc/llvm-project?rev=107042&view=rev
Log:
Fix thinko.

Modified:
    llvm/trunk/lib/Support/PrettyStackTrace.cpp

Modified: llvm/trunk/lib/Support/PrettyStackTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/PrettyStackTrace.cpp?rev=107042&r1=107041&r2=107042&view=diff
==============================================================================
--- llvm/trunk/lib/Support/PrettyStackTrace.cpp (original)
+++ llvm/trunk/lib/Support/PrettyStackTrace.cpp Mon Jun 28 13:33:48 2010
@@ -58,11 +58,13 @@
 #if defined (__APPLE__) && defined (HAVE_CRASHREPORTERCLIENT_H)
 //  If any clients of llvm try to link to libCrashReporterClient.a themselves,
 //  only one crash info struct will be used.
+extern "C" {
 CRASH_REPORTER_CLIENT_HIDDEN 
 struct crashreporter_annotations_t gCRAnnotations 
         __attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) 
-        = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0 };
-#else if defined (__APPLE__)
+        = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0 };
+}
+#elif defined (__APPLE__)
 static const char *__crashreporter_info__ = 0;
 asm(".desc ___crashreporter_info__, 0x10");
 #endif





More information about the llvm-commits mailing list