Merge branch 'master' of https://github.com/hashcat/oclHashcat

[hashcat.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index 278f63a..f0dc8fe 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -53,8 +53,9 @@
 typedef void *OCL_LIB;
 
 #ifdef HAVE_HWMON
-typedef void *NV_LIB;
-typedef void *AMD_LIB;
+typedef void *ADL_LIB;
+typedef void *NVAPI_LIB;
+typedef void *NVML_LIB;
 #ifdef OSX
 #define __stdcall
 #endif
@@ -86,8 +87,9 @@ typedef UINT64 uint64_t;
 typedef HINSTANCE OCL_LIB;
 
 #ifdef HAVE_HWMON
-typedef HINSTANCE NV_LIB;
-typedef HINSTANCE AMD_LIB;
+typedef HINSTANCE ADL_LIB;
+typedef HINSTANCE NVAPI_LIB;
+typedef HINSTANCE NVML_LIB;
 #endif
 
 #define mkdir(name,mode) mkdir (name)
@@ -123,4 +125,6 @@ void log_error (const char *fmt, ...);
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 #define MAX(a,b) (((a) > (b)) ? (a) : (b))
 
+#define CEIL(a) ((a - (int) (a)) > 0 ? a + 1 : a)
+
 #endif // COMMON_H