From ae457c992e48cd079b67f3c5a72969daddd4bd15 Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 8 Sep 2016 14:11:35 +0200 Subject: [PATCH] get rid of hc_global_data_t data in shared.c --- include/shared.h | 25 ++----------------------- src/hashcat.c | 1 + src/shared.c | 26 -------------------------- 3 files changed, 3 insertions(+), 49 deletions(-) diff --git a/include/shared.h b/include/shared.h index 85ba49b21..69c75db6e 100644 --- a/include/shared.h +++ b/include/shared.h @@ -9,30 +9,9 @@ #ifndef _SHARED_H #define _SHARED_H -#include -#include +#include +#include #include -#include -#include -#include - -/** - * OS specific includes - */ - -#if defined (_POSIX) -#include -#include -#include -#endif // _POSIX - -#if defined (_WIN) -#include -#endif // _WIN - -/** - * functions ok for shared - */ u32 get_random_num (const u32 min, const u32 max); diff --git a/src/hashcat.c b/src/hashcat.c index dadb030aa..a629af4df 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -19,6 +19,7 @@ #include #include #include +#include #if defined (_POSIX) #include diff --git a/src/shared.c b/src/shared.c index 63c9a4d7d..bd8e09862 100644 --- a/src/shared.c +++ b/src/shared.c @@ -6,36 +6,10 @@ * License.....: MIT */ -#if defined (__APPLE__) -#include -#endif - #include "common.h" #include "types_int.h" -#include "types.h" -#include "timer.h" -#include "memory.h" -#include "logging.h" -#include "ext_OpenCL.h" -#include "ext_ADL.h" -#include "ext_nvapi.h" -#include "ext_nvml.h" -#include "ext_xnvctrl.h" -#include "convert.h" -#include "locking.h" -#include "thread.h" -#include "rp_cpu.h" -#include "hwmon.h" -#include "mpsp.h" -#include "rp_cpu.h" -#include "opencl.h" -#include "restore.h" -#include "data.h" -#include "status.h" #include "shared.h" -extern hc_global_data_t data; - u32 get_random_num (const u32 min, const u32 max) { if (min == max) return (min);