am 964684ba: am 535478dd: Merge "ndk: <pthread.h>: formatting + updates"

* commit '964684ba5b1a9254d1505b0ac9cc6fd43c5db1c9':
  ndk: <pthread.h>: formatting + updates
This commit is contained in:
Andrew Hsieh
2012-04-02 07:58:10 -07:00
committed by Android Git Automerger
4 changed files with 12 additions and 12 deletions

View File

@@ -103,7 +103,7 @@ typedef volatile int pthread_once_t;
/* /*
* Prototypes * Prototypes
*/ */
#if __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -231,7 +231,7 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
__pthread_cleanup_pop( &__cleanup, (execute)); \ __pthread_cleanup_pop( &__cleanup, (execute)); \
} while (0); } while (0);
#if __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
@@ -240,4 +240,4 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
#define LONG_LONG_MAX __LONG_LONG_MAX__ #define LONG_LONG_MAX __LONG_LONG_MAX__
#define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1) #define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1)
#endif // _PTHREAD_H_ #endif /* _PTHREAD_H_ */

View File

@@ -103,7 +103,7 @@ typedef volatile int pthread_once_t;
/* /*
* Prototypes * Prototypes
*/ */
#if __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -258,7 +258,7 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
__pthread_cleanup_pop( &__cleanup, (execute)); \ __pthread_cleanup_pop( &__cleanup, (execute)); \
} while (0); } while (0);
#if __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
@@ -267,4 +267,4 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
#define LONG_LONG_MAX __LONG_LONG_MAX__ #define LONG_LONG_MAX __LONG_LONG_MAX__
#define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1) #define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1)
#endif // _PTHREAD_H_ #endif /* _PTHREAD_H_ */

View File

@@ -103,7 +103,7 @@ typedef volatile int pthread_once_t;
/* /*
* Prototypes * Prototypes
*/ */
#if __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -263,7 +263,7 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
__pthread_cleanup_pop( &__cleanup, (execute)); \ __pthread_cleanup_pop( &__cleanup, (execute)); \
} while (0); } while (0);
#if __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
@@ -272,4 +272,4 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
#define LONG_LONG_MAX __LONG_LONG_MAX__ #define LONG_LONG_MAX __LONG_LONG_MAX__
#define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1) #define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1)
#endif // _PTHREAD_H_ #endif /* _PTHREAD_H_ */

View File

@@ -103,7 +103,7 @@ typedef volatile int pthread_once_t;
/* /*
* Prototypes * Prototypes
*/ */
#if __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -302,7 +302,7 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
__pthread_cleanup_pop( &__cleanup, (execute)); \ __pthread_cleanup_pop( &__cleanup, (execute)); \
} while (0); } while (0);
#if __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif
@@ -311,4 +311,4 @@ extern void __pthread_cleanup_pop(__pthread_cleanup_t* c,
#define LONG_LONG_MAX __LONG_LONG_MAX__ #define LONG_LONG_MAX __LONG_LONG_MAX__
#define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1) #define LONG_LONG_MIN (-__LONG_LONG_MAX__ - 1)
#endif // _PTHREAD_H_ #endif /* _PTHREAD_H_ */