diff options
author | Benjamin Fleischer <fleiben@gmail.com> | 2014-02-03 09:01:26 +0100 |
---|---|---|
committer | Benjamin Fleischer <fleiben@gmail.com> | 2014-02-03 09:01:26 +0100 |
commit | c3d83ee24b60564e90440e4b38d58a0a5df8b8ef (patch) | |
tree | f8176a95405d37f2aea26410ae015e031c5156c2 | |
parent | 1fc97d3f2c02377c1f326ac1a4fc79449d6d3f00 (diff) | |
download | sshfs-c3d83ee24b60564e90440e4b38d58a0a5df8b8ef.tar sshfs-c3d83ee24b60564e90440e4b38d58a0a5df8b8ef.tar.gz sshfs-c3d83ee24b60564e90440e4b38d58a0a5df8b8ef.tar.bz2 sshfs-c3d83ee24b60564e90440e4b38d58a0a5df8b8ef.zip |
Fix redefinition of struct __local_sem_t
-rw-r--r-- | compat/darwin_compat.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/compat/darwin_compat.h b/compat/darwin_compat.h index 1c6ec78..0a16471 100644 --- a/compat/darwin_compat.h +++ b/compat/darwin_compat.h @@ -10,17 +10,15 @@ /* Semaphores */ -struct __local_sem_t -{ - unsigned int count; - pthread_mutex_t count_lock; - pthread_cond_t count_cond; -}; - -typedef struct fuse_sem { +typedef struct darwin_sem { int id; union { - struct __local_sem_t local; + struct + { + unsigned int count; + pthread_mutex_t count_lock; + pthread_cond_t count_cond; + } local; } __data; } darwin_sem_t; |