Skip to content
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

Jump to bottom

Add -fno-common to Makefile GCC flags #14

Merged
merged 1 commit into from Jun 5, 2020
Merged

Add -fno-common to Makefile GCC flags #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gAskpass/Makefile.am
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ ui_DATA = gaskpass.ui


AM_CFLAGS = \
-Wall -g -Og -ggdb \
-Wall -g -Og -ggdb -fno-common \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_SRC_DIR=\""$(abs_srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
Expand Down
4 changes: 2 additions & 2 deletions gAskpass/gaskpass.h
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ G_BEGIN_DECLS
typedef struct _gAskpassClass gAskpassClass;
typedef struct _gAskpass gAskpass;

GtkBuilder *builder;
extern GtkBuilder *builder;

struct _gAskpass
{
Expand All @@ -48,7 +48,7 @@ struct _gAskpassClass
GtkApplicationClass parent_class;
};

GtkWidget *dialog;
extern GtkWidget *dialog;

G_END_DECLS

Expand Down
6 changes: 3 additions & 3 deletions gAskpass/main.h
View file
Open in desktop
Expand Up @@ -21,9 +21,9 @@

#include "gaskpass.h"

gAskpass *app;
char *gstmpixmaps;
char *gstmui;
extern gAskpass *app;
extern char *gstmpixmaps;
extern char *gstmui;

void init_paths ();
GdkPixbuf* create_pixbuf (const gchar *filename);
2 changes: 1 addition & 1 deletion src/Makefile.am
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ ui_DATA = gstm.ui


AM_CFLAGS = \
-Wall -g -Og -ggdb \
-Wall -g -Og -ggdb -fno-common \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_SRC_DIR=\""$(abs_srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
Expand Down
7 changes: 7 additions & 0 deletions src/conffile.c
View file
Open in desktop
Expand Up @@ -28,6 +28,13 @@
#include "fnssht.h"
#include "support.h"

struct sshtunnel **gSTMtunnels;
struct portredir *portredirPtr;
struct sshtunnel stunnel;
struct sshtunnel *sshtunnelPtr;

int tunnelCount = 0;
int activeCount = 0;
gboolean noerrors = FALSE;

void gstm_free1tunnel(struct sshtunnel *tun) {
Expand Down
16 changes: 10 additions & 6 deletions src/conffile.h
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@ struct portredir {
xmlChar *port1;
xmlChar *host;
xmlChar *port2;
} *portredirPtr;
};

//tunnelobject
struct sshtunnel {
Expand All @@ -54,12 +54,16 @@ struct sshtunnel {
gboolean active;
int sshpid;
char *fn;
} stunnel, *sshtunnelPtr;
};

struct sshtunnel **gSTMtunnels;
int tunnelCount;
int activeCount;
gboolean noerrors;
extern struct sshtunnel **gSTMtunnels;
extern struct portredir *portredirPtr;
extern struct sshtunnel stunnel;
extern struct sshtunnel *sshtunnelPtr;

extern int tunnelCount;
extern int activeCount;
extern gboolean noerrors;

int gstm_readfiles(char *dir, struct sshtunnel ***tptr);
int gstm_file2tunnel(char *file, struct sshtunnel *tunnel);
Expand Down
22 changes: 11 additions & 11 deletions src/gstm.h
View file
Open in desktop
Expand Up @@ -50,20 +50,20 @@ struct _Gstm

};

int maindiag_width;
int maindiag_height;
extern int maindiag_width;
extern int maindiag_height;

GtkBuilder *builder;
GtkWidget *maindialog;
GtkWidget *aboutdialog;
GtkWidget *newdialog;
GtkWidget *tundialog;
GtkWidget *propertiesdialog;
extern GtkBuilder *builder;
extern GtkWidget *maindialog;
extern GtkWidget *aboutdialog;
extern GtkWidget *newdialog;
extern GtkWidget *tundialog;
extern GtkWidget *propertiesdialog;

GtkWidget *statusbar;
GtkWidget *tunlist;
extern GtkWidget *statusbar;
extern GtkWidget *tunlist;

GtkListStore *tunnellist_store;
extern GtkListStore *tunnellist_store;

GType gstm_get_type (void) G_GNUC_CONST;
Gstm *gstm_new (void);
Expand Down
8 changes: 4 additions & 4 deletions src/main.h
View file
Open in desktop
Expand Up @@ -22,10 +22,10 @@
#include "conffile.h"
#include "gstm.h"

Gstm *app;
char *gstmdir;
char *gstmpixmaps;
char *gstmui;
extern Gstm *app;
extern char *gstmdir;
extern char *gstmpixmaps;
extern char *gstmui;

void signalexit (int sig_num);
void init_paths ();
Expand Down
2 changes: 1 addition & 1 deletion src/systray.h
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@

#include <gtk/gtk.h>

GtkStatusIcon *ci;
extern GtkStatusIcon *ci;

void gstm_docklet_create ();
void gstm_toggle_mainwindow ();
Expand Down