gcc5_fix.diff 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 65d2491083abbcd4e2ef53d488b1be38a3f5b34d Mon Sep 17 00:00:00 2001
  2. From: Mike Kershaw / Dragorn <dragorn@kismetwireless.net>
  3. Date: Tue, 15 Mar 2016 22:04:37 -0400
  4. Subject: Hacky fix for GCC5
  5. ---
  6. spectool_gtk_widget.h | 6 +++---
  7. 1 file changed, 3 insertions(+), 3 deletions(-)
  8. diff --git a/spectool_gtk_widget.h b/spectool_gtk_widget.h
  9. index 1a77a2f..0caa7f7 100644
  10. --- a/spectool_gtk_widget.h
  11. +++ b/spectool_gtk_widget.h
  12. @@ -196,16 +196,16 @@ void spectool_widget_link_channel(GtkWidget *widget, SpectoolChannelOpts *opts);
  13. gint spectool_widget_timeout(gpointer *data);
  14. /* Calculate the channel clicked in */
  15. -inline int spectool_widget_find_chan_pt(SpectoolWidget *wwidget, int x, int y);
  16. +extern inline int spectool_widget_find_chan_pt(SpectoolWidget *wwidget, int x, int y);
  17. void spectool_widget_context_channels(gpointer *aux);
  18. void spectool_widget_context_dbm(gpointer *aux);
  19. void spectool_widget_context_dbmlines(gpointer *aux);
  20. /* Color space conversion tools */
  21. -inline void rgb_to_hsv(double r, double g, double b,
  22. +extern inline void rgb_to_hsv(double r, double g, double b,
  23. double *h, double *s, double *v);
  24. -inline void hsv_to_rgb(double *r, double *g, double *b,
  25. +extern inline void hsv_to_rgb(double *r, double *g, double *b,
  26. double h, double s, double v);
  27. G_END_DECLS
  28. --
  29. 2.14.5