Skip to content

Fix gnuaisgui map #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sv1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix gnuaisgui map #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b36130
apply patches from Debian project
Nov 14, 2023
3ed0ad3
fix gnuaisgui map
Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/cfgfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,15 @@ int read_cfgfile(char *f, struct cfgcmd *cmds)
tmp_file = fopen("/etc/gnuais.conf","r");
ret = 0;
if(tmp_file == NULL){
tmp_file = fopen("/usr/local/share/doc/gnuais/gnuais.conf-example","r");
tmp_file = fopen("/usr/local/share/doc/gnuais/gnuais.conf-example","r");
if(tmp_file == NULL){
tmp_file = fopen("/usr/share/doc/gnuais/gnuais.conf-example","r");
tmp_file = fopen("/usr/share/doc/gnuais/examples/gnuais.conf-example","r");
if(tmp_file == NULL){
hlog(LOG_ERR,"No gnuais.conf-example found to be copied to ~/.config/gnuais/config");
}
else {
hlog(LOG_NOTICE, "Using gnuais.conf-example as a starting point for ~/.config/gnuais/config...");
ret = cpfile(conf_home_folder,"/usr/share/doc/gnuais/gnuais.conf-example");
ret = cpfile(conf_home_folder,"/usr/share/doc/gnuais/examples/gnuais.conf-example");
if(ret == -1) hlog(LOG_ERR, "Could not copy configuration file to the home folder");
else hlog(LOG_NOTICE, "DONE creating configuration file (~/.config/gnuais/config). You should edit this file manually!");
}
Expand Down
10 changes: 2 additions & 8 deletions src/filter-i386.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@

#include <stdio.h>

#ifdef __GNUC_STDC_INLINE__
__attribute__ ((gnu_inline))
#endif
extern inline float __mac_g(const float *a, const float *b,
__attribute__ ((gnu_inline)) extern inline float __mac_g(const float *a, const float *b,
unsigned int size)
{
float sum = 0;
Expand All @@ -46,10 +43,7 @@ extern inline float __mac_g(const float *a, const float *b,
return sum;
}

#ifdef __GNUC_STDC_INLINE__
__attribute__ ((gnu_inline))
#endif
extern inline float __mac_c(const float *a, const float *b,
__attribute__ ((gnu_inline)) extern inline float __mac_c(const float *a, const float *b,
unsigned int size)
{
float f;
Expand Down
4 changes: 3 additions & 1 deletion src/gui/gui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,9 @@ int main(int argc, char **argv)
// (scrolled_window),
// drawing_area);
//osmmap = osm_gps_map_new ();
osmmap = g_object_new (OSM_TYPE_GPS_MAP,
osmmap = g_object_new (OSM_TYPE_GPS_MAP,
"map-source", OSM_GPS_MAP_SOURCE_OPENSTREETMAP,
"user-agent", "GnuAIS",
NULL);
// <-- End workaround
int tmp;
Expand Down
8 changes: 6 additions & 2 deletions src/out_mysql.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/*
* out_mysql.h
*
Expand All @@ -20,6 +19,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef OUT_MYSQL_H
#define OUT_MYSQL_H

#include <time.h>
#ifdef HAVE_MYSQL
Expand All @@ -32,7 +33,9 @@ struct mysql_state_t {
int connected;
int inserts;
#endif
} *my;
};

extern struct mysql_state_t *my;

extern struct mysql_state_t *myout_init();

Expand All @@ -55,3 +58,4 @@ extern int myout_ais_vesseldatab(struct mysql_state_t *my,

extern int myout_nmea(struct mysql_state_t *my, time_t tid, char *nmea);

#endif /* OUT_MYSQL_H */