1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
|
Enable support for GCC 5 builds
Index: b/spectool_gtk_widget.h
===================================================================
--- a/spectool_gtk_widget.h
+++ b/spectool_gtk_widget.h
@@ -196,16 +196,16 @@
gint spectool_widget_timeout(gpointer *data);
/* Calculate the channel clicked in */
-inline int spectool_widget_find_chan_pt(SpectoolWidget *wwidget, int x, int y);
+/*inline*/ int spectool_widget_find_chan_pt(SpectoolWidget *wwidget, int x, int y);
void spectool_widget_context_channels(gpointer *aux);
void spectool_widget_context_dbm(gpointer *aux);
void spectool_widget_context_dbmlines(gpointer *aux);
/* Color space conversion tools */
-inline void rgb_to_hsv(double r, double g, double b,
+/*inline*/ void rgb_to_hsv(double r, double g, double b,
double *h, double *s, double *v);
-inline void hsv_to_rgb(double *r, double *g, double *b,
+/*inline*/ void hsv_to_rgb(double *r, double *g, double *b,
double h, double s, double v);
G_END_DECLS
Index: b/spectool_gtk_channel.c
===================================================================
--- a/spectool_gtk_channel.c
+++ b/spectool_gtk_channel.c
@@ -39,7 +39,7 @@
G_DEFINE_TYPE(SpectoolChannel, spectool_channel, SPECTOOL_TYPE_WIDGET);
-inline int spectool_channel_find_chan_pt(SpectoolChannel *cwidget, int x, int y) {
+/*inline*/ int spectool_channel_find_chan_pt(SpectoolChannel *cwidget, int x, int y) {
int dbm, maxy, nchannels;
SpectoolWidget *wwidget;
Index: b/spectool_gtk_widget.c
===================================================================
--- a/spectool_gtk_widget.c
+++ b/spectool_gtk_widget.c
@@ -876,7 +876,7 @@
/* Annoying that nothing else seems to include this, but we need it for
* calculating the gradient of colors for the channel highlights */
-inline void rgb_to_hsv(double r, double g, double b,
+/*inline*/ void rgb_to_hsv(double r, double g, double b,
double *h, double *s, double *v) {
double min, delta;
@@ -956,7 +956,7 @@
}
}
-inline void hsv_to_rgb(double *r, double *g, double *b,
+/*inline*/ void hsv_to_rgb(double *r, double *g, double *b,
double h, double s, double v) {
double hf = h / 60;
int i = floor(hf);
|