FIX: the #define M_PI is now optional. Moved a bunch of header invocations into...

diff --git a/client/ui.c b/client/ui.c
index 0dc9118b2835a737f38cd4bc69f66a7fbe068a35..48a55b1fdfea12e5d9d9c26cc737d9e50b3049cb 100644 (file)
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,20 +9,7 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
 // 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 "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;
 double CursorScaleFactor;
 int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64;
 int offline;

diff --git a/client/ui.h b/client/ui.h
index 736e7641d4e90fb9726f8dc0583e7d752a0a9572..9603c84251479b2debce3b4bcf24675f18be5419 100644 (file)
--- a/client/ui.h
+++ b/client/ui.h
@@ -10,11 +10,25 @@
 
 #ifndef UI_H__
 #define UI_H__
 
 #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 <math.h>
 #include <complex.h>

+#include "loclass/cipherutils.h"

 #include "util.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);
 void ShowGui(void);
 void HideGraphWindow(void);
 void ShowGraphWindow(void);