commit | da8ea213abb8bec08da37622179061630bd8e2f8 | [log] [tgz] |
---|---|---|
author | David 'Digit' Turner <digit@android.com> | Fri Mar 11 09:32:33 2011 -0800 |
committer | Android Code Review <code-review@android.com> | Fri Mar 11 09:32:33 2011 -0800 |
tree | 9db1cb1fdce56f69749d2381cbc52849030bdd9b | |
parent | e6e2ba1d40241c85de16d75cbd397cc3670d7535 [diff] | |
parent | 8b3cea67326c1afb9b7815ae042819c0c3a1f144 [diff] |
Merge "libc: <stdint.h>: Don't make __STD_CONSTANT_MACROS available if only __STD_LIMIT_MACROS is defined."
diff --git a/libc/include/pthread.h b/libc/include/pthread.h index 27e13e4..9d05769 100644 --- a/libc/include/pthread.h +++ b/libc/include/pthread.h
@@ -103,7 +103,7 @@ /* * Prototypes */ -#if __cplusplus +#ifdef __cplusplus extern "C" { #endif @@ -302,7 +302,7 @@ __pthread_cleanup_pop( &__cleanup, (execute)); \ } while (0); -#if __cplusplus +#ifdef __cplusplus } /* extern "C" */ #endif