[vlc-commits] Revert "Android: hack to fix warnings in pthread.h when compiling in C++"

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jan 25 00:14:26 2012 -0500| [abd3163a1f299dd881eb64aae486f0f7f185433d] | committer: Rafaël Carré

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

This reverts commit 1a1bba5a3da60b1433509f54375f0c12db22b3c1.

Conflicts:

	include/vlc_fixups.h
(cherry picked from commit 3437e616aea5bad334b1a304d2af0c239415f922)

Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=abd3163a1f299dd881eb64aae486f0f7f185433d
---

 include/vlc_fixups.h |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index e0152fc..15ebb4c 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -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