X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=os2%2Fos2ish.h;h=20e413a837a16c6a703156d403e05f7e6399f4ab;hb=3db8f154c4c6e098a5a0bdf7932e8f86fbd2c451;hp=a60e57326252ad01ebacfad2edaa907c8bcc4ad2;hpb=9c75282ff8f4361bf940245aa2513c77d38c5f5c;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/os2/os2ish.h b/os2/os2ish.h
index a60e573..20e413a 100644
--- a/os2/os2ish.h
+++ b/os2/os2ish.h
@@ -99,115 +99,8 @@
 # undef I_SYS_UN
 #endif 
 
-#ifdef USE_5005THREADS
-
-#define do_spawn(a)      os2_do_spawn(aTHX_ (a))
-#define do_aspawn(a,b,c) os2_do_aspawn(aTHX_ (a),(b),(c))
-
-#define OS2_ERROR_ALREADY_POSTED 299	/* Avoid os2.h */
-
-extern int rc;
-
-#define MUTEX_INIT(m) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = _rmutex_create(m,0)))				\
-	    Perl_croak_nocontext("panic: MUTEX_INIT: rc=%i", rc);	\
-    } STMT_END
-#define MUTEX_LOCK(m) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = _rmutex_request(m,_FMR_IGNINT)))		\
-	    Perl_croak_nocontext("panic: MUTEX_LOCK: rc=%i", rc);	\
-    } STMT_END
-#define MUTEX_UNLOCK(m) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = _rmutex_release(m)))				\
-	    Perl_croak_nocontext("panic: MUTEX_UNLOCK: rc=%i", rc);	\
-    } STMT_END
-#define MUTEX_DESTROY(m) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = _rmutex_close(m)))				\
-	    Perl_croak_nocontext("panic: MUTEX_DESTROY: rc=%i", rc);	\
-    } STMT_END
-
-#define COND_INIT(c) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = DosCreateEventSem(NULL,c,0,0)))		\
-	    Perl_croak_nocontext("panic: COND_INIT: rc=%i", rc);	\
-    } STMT_END
-#define COND_SIGNAL(c) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = DosPostEventSem(*(c))) && rc != OS2_ERROR_ALREADY_POSTED)\
-	    Perl_croak_nocontext("panic: COND_SIGNAL, rc=%ld", rc);	\
-    } STMT_END
-#define COND_BROADCAST(c) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = DosPostEventSem(*(c))) && rc != OS2_ERROR_ALREADY_POSTED)\
-	    Perl_croak_nocontext("panic: COND_BROADCAST, rc=%i", rc);	\
-    } STMT_END
-/* #define COND_WAIT(c, m) \
-    STMT_START {						\
-	if (WaitForSingleObject(*(c),INFINITE) == WAIT_FAILED)	\
-	    Perl_croak_nocontext("panic: COND_WAIT");		\
-    } STMT_END
-*/
-#define COND_WAIT(c, m) os2_cond_wait(c,m)
-
-#define COND_WAIT_win32(c, m) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = SignalObjectAndWait(*(m),*(c),INFINITE,FALSE)))	\
-	    Perl_croak_nocontext("panic: COND_WAIT");			\
-	else							\
-	    MUTEX_LOCK(m);					\
-    } STMT_END
-#define COND_DESTROY(c) \
-    STMT_START {						\
-	int rc;							\
-	if ((rc = DosCloseEventSem(*(c))))			\
-	    Perl_croak_nocontext("panic: COND_DESTROY, rc=%i", rc);	\
-    } STMT_END
-/*#define THR ((struct thread *) TlsGetValue(PL_thr_key))
-*/
-
-#ifdef USE_SLOW_THREAD_SPECIFIC
-#  define pthread_getspecific(k)	(*_threadstore())
-#  define pthread_setspecific(k,v)	(*_threadstore()=v,0)
-#  define pthread_key_create(keyp,flag)	(*keyp=_gettid(),0)
-#else /* USE_SLOW_THREAD_SPECIFIC */
-#  define pthread_getspecific(k)	(*(k))
-#  define pthread_setspecific(k,v)	(*(k)=(v),0)
-#  define pthread_key_create(keyp,flag)			\
-	( DosAllocThreadLocalMemory(1,(U32*)keyp)	\
-	  ? Perl_croak_nocontext("LocalMemory"),1	\
-	  : 0						\
-	)
-#endif /* USE_SLOW_THREAD_SPECIFIC */
-#define pthread_key_delete(keyp)
-#define pthread_self()			_gettid()
-#define YIELD				DosSleep(0)
-
-#ifdef PTHREADS_INCLUDED		/* For ./x2p stuff. */
-int pthread_join(pthread_t tid, void **status);
-int pthread_detach(pthread_t tid);
-int pthread_create(pthread_t *tid, const pthread_attr_t *attr,
-		   void *(*start_routine)(void*), void *arg);
-#endif /* PTHREAD_INCLUDED */
-
-#define THREADS_ELSEWHERE
-
-#else /* USE_5005THREADS */
-
 #define do_spawn(a)      os2_do_spawn(a)
 #define do_aspawn(a,b,c) os2_do_aspawn((a),(b),(c))
-
-#endif /* USE_5005THREADS */
  
 void Perl_OS2_init(char **);
 void Perl_OS2_init3(char **envp, void **excH, int flags);
@@ -382,6 +275,8 @@ void *emx_realloc (void *, size_t);
 # define HAS_BOOL 1
 #endif
 
+#include <emx/io.h> /* for _fd_flags() prototype */
+
 static inline bool
 _PERLIO_IS_BINMODE_FD(int fd)
 {