diff options
| author | Elliott Hughes <enh@google.com> | 2018-07-13 22:09:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-13 22:09:54 -0700 |
| commit | f6aa9d6fb18083c374517725412d54d696520bbd (patch) | |
| tree | a7c729d1c8b8a22a042a996675b87f1218e1055d | |
| parent | 7a45a0ea2b640d1810608d741274d3bffce2ff86 (diff) | |
| parent | 952c1ee50f8bb4735931e39fb3ad0081781b5cd4 (diff) | |
| download | goldfish-opengl-temp_p_merge.tar.gz | |
Code that needs to build for pre-C++11 can't use nullptr.temp_p_merge
am: 952c1ee50f
Change-Id: Ib760890aa457d343ef66bb191f19d663422ff216
| -rw-r--r-- | shared/OpenglCodecCommon/PortableMutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/shared/OpenglCodecCommon/PortableMutex.h b/shared/OpenglCodecCommon/PortableMutex.h index 4e86721b..b02ed617 100644 --- a/shared/OpenglCodecCommon/PortableMutex.h +++ b/shared/OpenglCodecCommon/PortableMutex.h @@ -44,7 +44,7 @@ static __inline__ void mutex_unlock(mutex_t* lock) { } static __inline__ int mutex_init(mutex_t* lock) { - return pthread_mutex_init(lock, nullptr); + return pthread_mutex_init(lock, NULL); } static __inline__ void mutex_destroy(mutex_t* lock) { |