From 45293f1096a2fae3fbdad5f90248929cd9c6f562 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 18 Feb 2016 20:08:34 +0100
Subject: [PATCH] FIX:  the #define M_PI is now optional.  Moved a bunch of
 header invocations into the ui.h

---
 client/ui.c | 13 -------------
 client/ui.h | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 0dc9118b..48a55b1f 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,20 +9,7 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <time.h>
-#include <readline/readline.h>
-#include <pthread.h>
-#include "loclass/cipherutils.h"
 #include "ui.h"
-#include "cmdmain.h"
-#include "cmddata.h"
-#include "graph.h"
-#define M_PI 3.14159265358979323846264338327
-
 double CursorScaleFactor;
 int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64;
 int offline;
diff --git a/client/ui.h b/client/ui.h
index 736e7641..9603c842 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -10,11 +10,25 @@
 
 #ifndef UI_H__
 #define UI_H__
-
+#define _USE_MATH_DEFINES
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdbool.h>
+#include <time.h>
+#include <readline/readline.h>
+#include <pthread.h>
 #include <math.h>
 #include <complex.h>
+#include "loclass/cipherutils.h"
 #include "util.h"
+#include "cmdmain.h"
+#include "cmddata.h"
+#include "graph.h"
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846264338327
+#endif
 void ShowGui(void);
 void HideGraphWindow(void);
 void ShowGraphWindow(void);
-- 
2.39.2