mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-12 23:29:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

reconcile my and Sean's fixes

Browse source
This commit is contained in:
Walter Bright 2009-02-08 23:18:30 +00:00
parent b8e9344ad8
commit 740fc18211
2 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
std/c/linux/linux.d
View file

@ -614,13 +614,23 @@ extern (C)
/* from semaphore.h
*/
version (OSX)
{
alias int sem_t;
}
else version (linux)
{
struct sem_t
{
_pthread_fastlock __sem_lock;
int __sem_value;
void* __sem_waiting;
}
}
else
{
static assert(0);
}
int sem_init(sem_t*, int, uint);
int sem_wait(sem_t*);
int sem_trywait(sem_t*);

9
std/c/linux/pthread.d
View file

@ -5,15 +5,11 @@
module std.c.linux.pthread;
<<<<<<< .mine
import std.c.linux.linux;
extern (C)
=======
extern (C):
version(linux)
>>>>>>> .r909
{
/* pthread declarations taken from pthread headers and
http://svn.dsource.org/projects/bindings/trunk/pthreads.d
@ -209,11 +205,6 @@ version(OSX)
_pthread_cleanup_buffer* __next;
}
struct __sched_param // bits/sched.h
{
int __sched_priority;
}
struct __sched_param
{
int sched_priority;