mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-11-26 03:54:55 +00:00
bds b1i: Merging latest changes from upstream/next
This commit is contained in:
@@ -56,13 +56,14 @@
|
||||
#include "MATH_CONSTANTS.h"
|
||||
#include "gnss_frequencies.h"
|
||||
#include "gnss_obs_codes.h"
|
||||
#include <pthread.h>
|
||||
#include <netinet/in.h>
|
||||
#include <cctype>
|
||||
#include <cmath>
|
||||
#include <cstdarg>
|
||||
#include <cstdint>
|
||||
#include <cstdio>
|
||||
#include <cstdlib>
|
||||
#include <netinet/in.h>
|
||||
#include <pthread.h>
|
||||
|
||||
|
||||
/* macros --------------------------------------------------------------------*/
|
||||
@@ -1211,7 +1212,7 @@ typedef struct
|
||||
char local[1024]; /* local file path */
|
||||
int topts[4]; /* time options {poff,tint,toff,tretry} (s) */
|
||||
gtime_t tnext; /* next retry time (gpst) */
|
||||
pthread_t thread; /* download thread */
|
||||
pthread_t thread; /* download thread */
|
||||
} ftp_t;
|
||||
|
||||
|
||||
@@ -1284,7 +1285,7 @@ typedef struct
|
||||
stream_t stream[8]; /* streams {rov,base,corr,sol1,sol2,logr,logb,logc} */
|
||||
stream_t *moni; /* monitor stream */
|
||||
unsigned int tick; /* start tick */
|
||||
pthread_t thread; /* server thread */
|
||||
pthread_t thread; /* server thread */
|
||||
int cputime; /* CPU time (ms) for a processing cycle */
|
||||
int prcout; /* missing observation data count */
|
||||
lock_t lock; /* lock flag */
|
||||
|
||||
Reference in New Issue
Block a user