From 34510ea8b88208b5fdb14462787fdf1ca6f68a0a Mon Sep 17 00:00:00 2001 From: 168492376 <168492376@qq.com> Date: Thu, 17 Apr 2025 00:43:47 +0800 Subject: [PATCH] mac os build support --- src/decodenav.h | 3 +++ src/decodeobs.c | 2 +- src/decodeobs.h | 4 +++- src/init_val.h | 1 + src/obscode.h | 3 ++- src/readobsnav.c | 3 ++- src/readobsnav.h | 2 ++ src/satellite.h | 2 +- src/str.c | 1 + src/str.h | 1 + src/timeconvert.h | 1 + 11 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/decodenav.h b/src/decodenav.h index 09fef92..ded3969 100644 --- a/src/decodenav.h +++ b/src/decodenav.h @@ -2,6 +2,9 @@ #define DECODENAV_H #include "comtyp.h" +#include +#include +#include "satellite.h" /* decode RINEX NAV header ---------------------------------------------------*/ void decode_navh(char *buff, nav_t *nav); diff --git a/src/decodeobs.c b/src/decodeobs.c index c5ff96e..c8f1e99 100644 --- a/src/decodeobs.c +++ b/src/decodeobs.c @@ -2,7 +2,7 @@ #include "str.h" #include "obscode.h" -decode_obsh(FILE *fp, char *buff, double ver, int *tsys, +void decode_obsh(FILE *fp, char *buff, double ver, int *tsys, char tobs[][MAXOBSTYPE][4],obs_t* obs, nav_t *nav, sta_t *sta) { // default codes for unknown code diff --git a/src/decodeobs.h b/src/decodeobs.h index a294077..0e820ba 100644 --- a/src/decodeobs.h +++ b/src/decodeobs.h @@ -1,8 +1,10 @@ #ifndef DECODEOBS_H #define DECODEOBS_H #include "comtyp.h" +#include "satellite.h" #include - +#include +#include /* decode RINEX observation data file header ---------------------------------*/ void decode_obsh(FILE *fp, char *buff, double ver, int *tsys, char tobs[][MAXOBSTYPE][4],obs_t* obs, nav_t *nav, sta_t *sta); diff --git a/src/init_val.h b/src/init_val.h index e471aee..4b9fe66 100644 --- a/src/init_val.h +++ b/src/init_val.h @@ -1,6 +1,7 @@ #ifndef INIT_VAL_H #define INIT_VAL_H #include "comtyp.h" +#include void init_sta(sta_t *sta); diff --git a/src/obscode.h b/src/obscode.h index ad9333d..9387598 100644 --- a/src/obscode.h +++ b/src/obscode.h @@ -1,6 +1,7 @@ #ifndef OBSCODE_H #define OBSCODE_H - +#include +#include /* convert RINEX obs-type ver.2 -> ver.3 -------------------------------------*/ void convcode(double ver, int sys, const char *str, char *type); diff --git a/src/readobsnav.c b/src/readobsnav.c index 4b999da..bf81032 100644 --- a/src/readobsnav.c +++ b/src/readobsnav.c @@ -8,6 +8,7 @@ #include "decodenav.h" #include "str.h" #include "timeconvert.h" +#include "satellite.h" /* add ephemeris to navigation data ------------------------------------------*/ static int add_eph(nav_t *nav, const eph_t *eph) @@ -619,7 +620,7 @@ int readrnxfile(const char *filepath,gtime_t ts,gtime_t te,double ti,const char* return status; } status = readrnxfp(fp,ts,te,ti,opt,flag,index,type,obs,nav,sta); - close(fp); + close((int)fp); return status; } diff --git a/src/readobsnav.h b/src/readobsnav.h index c30ffe1..9e1ba05 100644 --- a/src/readobsnav.h +++ b/src/readobsnav.h @@ -4,6 +4,8 @@ #include "comtyp.h" #include "option.h" #include "const.h" +#include +#include // Read obs and nav data ----------------------------------------------------- bool readobsnav(gtime_t ts, gtime_t te, double ti,const char** infile,const int* index,int n, diff --git a/src/satellite.h b/src/satellite.h index 6b9ffa8..86d3fe4 100644 --- a/src/satellite.h +++ b/src/satellite.h @@ -1,6 +1,6 @@ #ifndef SATELLITE_H #define SATELLITE_H - +#include /* satellite id to satellite number -------------------------------------------- * convert satellite id to satellite number * args : char *id I satellite id (nn,Gnn,Rnn,Enn,Jnn,Cnn,Inn or Snn) diff --git a/src/str.c b/src/str.c index 6180f71..3ceff6d 100644 --- a/src/str.c +++ b/src/str.c @@ -1,4 +1,5 @@ #include +#include #include "str.h" #include "timeconvert.h" diff --git a/src/str.h b/src/str.h index 213385a..0d538ce 100644 --- a/src/str.h +++ b/src/str.h @@ -2,6 +2,7 @@ #define STR_H #include "comtyp.h" +#include //set string without tail space void setstr(char *dst, const char *src, int n); diff --git a/src/timeconvert.h b/src/timeconvert.h index 9ec9d06..cbe0912 100644 --- a/src/timeconvert.h +++ b/src/timeconvert.h @@ -2,6 +2,7 @@ #define TIME_H #include "comtyp.h" +#include /* convert calendar day/time to time ------------------------------------------- * convert calendar day/time to gtime_t struct