projects
/
hashcat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ef80fb
)
Do not try to use clock_gettime() on OSX
author
jsteube
<jens.steube@gmail.com>
Sun, 12 Jun 2016 16:07:26 +0000
(18:07 +0200)
committer
jsteube
<jens.steube@gmail.com>
Sun, 12 Jun 2016 16:07:26 +0000
(18:07 +0200)
src/hashcat.c
patch
|
blob
|
history
diff --git
a/src/hashcat.c
b/src/hashcat.c
index
4405789
..
ab38fe2
100644
(file)
--- a/
src/hashcat.c
+++ b/
src/hashcat.c
@@
-5425,7
+5425,20
@@
static uint generate_bitmaps (const uint digests_cnt, const uint dgst_size, cons
* main
*/
* main
*/
-#ifdef _WIN
+#ifdef LINUX
+int (*clock_gettime_orig) (clockid_t clk_id, struct timespec *tp);
+
+int clock_gettime (clockid_t clk_id, struct timespec *tp)
+{
+ int r = clock_gettime_orig (clk_id, tp);
+
+ usleep (NVIDIA_100PERCENTCPU_WORKAROUND);
+
+ return r;
+}
+#endif
+
+#ifdef WIN
void SetConsoleWindowSize (const int x)
{
HANDLE h = GetStdHandle (STD_OUTPUT_HANDLE);
void SetConsoleWindowSize (const int x)
{
HANDLE h = GetStdHandle (STD_OUTPUT_HANDLE);
@@
-5451,26
+5464,13
@@
void SetConsoleWindowSize (const int x)
}
#endif
}
#endif
-#ifdef _POSIX
-int (*clock_gettime_orig) (clockid_t clk_id, struct timespec *tp);
-
-int clock_gettime (clockid_t clk_id, struct timespec *tp)
-{
- int r = clock_gettime_orig (clk_id, tp);
-
- usleep (NVIDIA_100PERCENTCPU_WORKAROUND);
-
- return r;
-}
-#endif
-
int main (int argc, char **argv)
{
int main (int argc, char **argv)
{
- #ifdef _POSIX
+ #ifdef LINUX
clock_gettime_orig = dlsym (RTLD_NEXT, "clock_gettime");
#endif
clock_gettime_orig = dlsym (RTLD_NEXT, "clock_gettime");
#endif
- #ifdef _WIN
+ #ifdef WIN
SetConsoleWindowSize (132);
#endif
SetConsoleWindowSize (132);
#endif