github/hashcat
1
Fork 0
mirror of https://github.com/hashcat/hashcat synced 2024-12-23 14:13:43 +01:00
Code Releases Activity

Merge pull request #1159 from neheb/master

Browse Source 
Some cleanups
This commit is contained in:
Jens Steube 2017-03-05 21:20:43 +01:00 committed by GitHub
commit a4d62678ce
6 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/common.h
View File

@ -22,7 +22,7 @@
// needed for *time_r functions under MinGW // needed for *time_r functions under MinGW
#ifndef _POSIX_THREAD_SAFE_FUNCTIONS #ifndef _POSIX_THREAD_SAFE_FUNCTIONS
#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L #define _POSIX_THREAD_SAFE_FUNCTIONS 200809L
#endif #endif
// needed for 64-bit off_t on 32-bit OSes // needed for 64-bit off_t on 32-bit OSes
@ -30,6 +30,10 @@
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
#endif #endif
#ifndef _FORTIFY_SOURCE
#define _FORTIFY_SOURCE 2
#endif
#define NOMINMAX 1 #define NOMINMAX 1
#define MIN(a,b) (((a) < (b)) ? (a) : (b)) #define MIN(a,b) (((a) < (b)) ? (a) : (b))

16
include/ext_OpenCL.h
View File

@ -11,21 +11,7 @@
#if defined (__APPLE__) #if defined (__APPLE__)
#include <OpenCL/cl.h> #include <OpenCL/cl.h>
#endif #else
#if defined (_WIN)
#include <CL/cl.h>
#endif
#if defined (__linux__)
#include <CL/cl.h>
#endif
#if defined (__FreeBSD__)
#include <CL/cl.h>
#endif
#if defined (__CYGWIN__)
#include <CL/cl.h> #include <CL/cl.h>
#endif #endif

3
include/pidfile.h
View File

@ -13,9 +13,6 @@
#if defined (_WIN) #if defined (_WIN)
#include <windows.h> #include <windows.h>
#include <psapi.h> #include <psapi.h>
#else
#include <sys/types.h>
#include <sys/stat.h>
#endif // _WIN #endif // _WIN
int pidfile_ctx_init (hashcat_ctx_t *hashcat_ctx); int pidfile_ctx_init (hashcat_ctx_t *hashcat_ctx);

3
include/restore.h
View File

@ -13,9 +13,6 @@
#if defined (_WIN) #if defined (_WIN)
#include <windows.h> #include <windows.h>
#include <psapi.h> #include <psapi.h>
#else
#include <sys/types.h>
#include <sys/stat.h>
#endif // _WIN #endif // _WIN
#define RESTORE_VERSION_MIN 340 #define RESTORE_VERSION_MIN 340

2
src/Makefile
View File

@ -121,7 +121,7 @@ VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=+
## General compiler and linker options ## General compiler and linker options
## ##
CFLAGS += -pipe -std=c99 -Iinclude/ -Iinclude/lzma_sdk/ -IOpenCL/ CFLAGS += -pipe -std=gnu99 -Iinclude/ -Iinclude/lzma_sdk/ -IOpenCL/
ifeq ($(PRODUCTION),0) ifeq ($(PRODUCTION),0)
CFLAGS += -W CFLAGS += -W

4
src/dictstat.c
View File

@ -16,11 +16,7 @@ int sort_by_dictstat (const void *s1, const void *s2)
dictstat_t *d1 = (dictstat_t *) s1; dictstat_t *d1 = (dictstat_t *) s1;
dictstat_t *d2 = (dictstat_t *) s2; dictstat_t *d2 = (dictstat_t *) s2;
#if defined (__linux__) || defined (__CYGWIN__)
d2->stat.st_atim = d1->stat.st_atim;
#else
d2->stat.st_atime = d1->stat.st_atime; d2->stat.st_atime = d1->stat.st_atime;
#endif
return memcmp (&d1->stat, &d2->stat, sizeof (struct stat)); return memcmp (&d1->stat, &d2->stat, sizeof (struct stat));
} }