Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(267)

Unified Diff: tests/threads/thread_test.c

Issue 7265001: Build and use libraries locally in the nacl build, not requiring "partial SDK" (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: windows .s/.S horror Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« tests/ppapi_example_audio/audio.cc ('K') | « tests/ppapi_example_audio/audio.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/threads/thread_test.c
diff --git a/tests/threads/thread_test.c b/tests/threads/thread_test.c
index 312909fdb4358aadec30a5cace5bd881abdae5da..ef776ff2faecf126128adcc30238c1b653bf4aba 100644
--- a/tests/threads/thread_test.c
+++ b/tests/threads/thread_test.c
@@ -1,7 +1,7 @@
/*
- * Copyright 2008 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
+ * Copyright (c) 2011 The Native Client Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
*/
/*
@@ -342,7 +342,12 @@ void TestUnlockUninitializedReturnValue() {
pthread_once_t once_control = PTHREAD_ONCE_INIT;
-typedef int AtomicInt32; /* Why is this needed? We included pthread already. */
+/*
+ * The nacl-newlib pthread.h declares this type, but glibc's pthread.h does not.
+ */
+#ifdef __GLIBC__
+typedef int AtomicInt32;
+#endif
void pthread_once_routine() {
static AtomicInt32 count = 0;
« tests/ppapi_example_audio/audio.cc ('K') | « tests/ppapi_example_audio/audio.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698