mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 15:23:04 +00:00
Code Issues Releases Wiki Activity

Fix build issue in OS X

Browse Source 
Define of thread_t to pthread_t in rtklib.h was colliding with system
include in OS X. Not used elsewhere, so find&replaced with pthread_t.
This commit is contained in:
Rodrigo Ventura
2018-08-19 10:23:07 +01:00
parent bc8fab36e5
commit ad6bbee930
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/algorithms/libs/rtklib/rtklib.h
View File

@@ -71,7 +71,6 @@
#define socket_t int #define socket_t int
#define closesocket close #define closesocket close
#define lock_t pthread_mutex_t #define lock_t pthread_mutex_t
#define thread_t pthread_t
#define initlock(f) pthread_mutex_init(f, NULL) #define initlock(f) pthread_mutex_init(f, NULL)
#define rtk_lock(f) pthread_mutex_lock(f) #define rtk_lock(f) pthread_mutex_lock(f)
#define rtk_unlock(f) pthread_mutex_unlock(f) #define rtk_unlock(f) pthread_mutex_unlock(f)
@@ -1211,7 +1210,7 @@ typedef struct
char local[1024]; /* local file path */ char local[1024]; /* local file path */
int topts[4]; /* time options {poff,tint,toff,tretry} (s) */ int topts[4]; /* time options {poff,tint,toff,tretry} (s) */
gtime_t tnext; /* next retry time (gpst) */ gtime_t tnext; /* next retry time (gpst) */
thread_t thread; /* download thread */ pthread_t thread; /* download thread */
} ftp_t; } ftp_t;
@@ -1284,7 +1283,7 @@ typedef struct
stream_t stream[8]; /* streams {rov,base,corr,sol1,sol2,logr,logb,logc} */ stream_t stream[8]; /* streams {rov,base,corr,sol1,sol2,logr,logb,logc} */
stream_t *moni; /* monitor stream */ stream_t *moni; /* monitor stream */
unsigned int tick; /* start tick */ unsigned int tick; /* start tick */
thread_t thread; /* server thread */ pthread_t thread; /* server thread */
int cputime; /* CPU time (ms) for a processing cycle */ int cputime; /* CPU time (ms) for a processing cycle */
int prcout; /* missing observation data count */ int prcout; /* missing observation data count */
lock_t lock; /* lock flag */ lock_t lock; /* lock flag */