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

This commit is contained in:
iceman1001 2016-02-18 20:08:34 +01:00
commit 45293f1096
2 changed files with 15 additions and 14 deletions

View file

@ -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; double CursorScaleFactor;
int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64; int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64;
int offline; int offline;

View file

@ -10,11 +10,25 @@
#ifndef UI_H__ #ifndef UI_H__
#define 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 <math.h>
#include <complex.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 ShowGui(void);
void HideGraphWindow(void); void HideGraphWindow(void);
void ShowGraphWindow(void); void ShowGraphWindow(void);