1
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00

Revert "Android: hack to fix warnings in pthread.h when compiling in C++"

This reverts commit 1a1bba5a3d.

Conflicts:

	include/vlc_fixups.h
This commit is contained in:
Rafaël Carré 2012-01-25 00:14:26 -05:00
parent 56018495fb
commit 3437e616ae

View File

@ -329,18 +329,6 @@ long jrand48 (unsigned short subi[3]);
long nrand48 (unsigned short subi[3]);
#endif
#ifdef __ANDROID__
# undef __linux__
# ifndef __cplusplus
# define __cplusplus 0
# endif
# include <pthread.h>
# if __cplusplus == 0
# undef __cplusplus
# endif
char *tempnam(const char *, const char *);
#endif // ANDROID
#ifdef __OS2__
# undef HAVE_FORK /* Implementation of fork() is imperfect on OS/2 */
#endif