Skip to content

Commit 9a54829

Browse files
committed
Fix some OSX compiler errors
1 parent 19e3669 commit 9a54829

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

src/hashcat.c

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13984,7 +13984,6 @@ int main (int argc, char **argv)
1398413984
#ifdef HAVE_HWMON
1398513985
hm_attrs_t hm_adapters_nv[DEVICES_MAX] = { { { 0 }, 0, 0, 0, 0, 0 } };
1398613986
hm_attrs_t hm_adapters_amd[DEVICES_MAX] = { { { 0 }, 0, 0, 0, 0, 0 } };
13987-
#endif
1398813987

1398913988
if (gpu_temp_disable == 0)
1399013989
{
@@ -14110,33 +14109,17 @@ int main (int argc, char **argv)
1411014109
* OpenCL devices: allocate buffer for device specific information
1411114110
*/
1411214111

14113-
#ifdef HAVE_HWMON
1411414112
int *temp_retain_fanspeed_value = (int *) mycalloc (data.devices_cnt, sizeof (int));
1411514113
int *temp_retain_fanpolicy_value = (int *) mycalloc (data.devices_cnt, sizeof (int));
1411614114

1411714115
ADLOD6MemClockState *od_clock_mem_status = (ADLOD6MemClockState *) mycalloc (data.devices_cnt, sizeof (ADLOD6MemClockState));
1411814116

1411914117
int *od_power_control_status = (int *) mycalloc (data.devices_cnt, sizeof (int));
14120-
#endif
14121-
14122-
/**
14123-
* enable custom signal handler(s)
14124-
*/
14125-
14126-
if (benchmark == 0)
14127-
{
14128-
hc_signal (sigHandler_default);
14129-
}
14130-
else
14131-
{
14132-
hc_signal (sigHandler_benchmark);
14133-
}
1413414118

1413514119
/**
1413614120
* User-defined GPU temp handling
1413714121
*/
1413814122

14139-
#ifdef HAVE_HWMON
1414014123
if (gpu_temp_disable == 1)
1414114124
{
1414214125
gpu_temp_abort = 0;
@@ -14158,6 +14141,19 @@ int main (int argc, char **argv)
1415814141
data.gpu_temp_retain = gpu_temp_retain;
1415914142
#endif
1416014143

14144+
/**
14145+
* enable custom signal handler(s)
14146+
*/
14147+
14148+
if (benchmark == 0)
14149+
{
14150+
hc_signal (sigHandler_default);
14151+
}
14152+
else
14153+
{
14154+
hc_signal (sigHandler_benchmark);
14155+
}
14156+
1416114157
/**
1416214158
* inform the user
1416314159
*/

0 commit comments

Comments
 (0)