Merge pull request #3159 from matrix/missing_STR_M2S_replacement

Rename STR() to M2S(), part 2
2025-03-25 03:45:43 +00:00 · 2022-02-08 10:27:40 +01:00 · 2022-02-08 10:27:40 +01:00 · ac19970276
commit ac19970276
parent be75e4b4ea b0c6738289
129 changed files with 255 additions and 255 deletions
--- a/OpenCL/m00400-optimized.cl
+++ b/OpenCL/m00400-optimized.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct phpass_tmp
 {
--- a/OpenCL/m00400-pure.cl
+++ b/OpenCL/m00400-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct phpass_tmp
 {
--- a/OpenCL/m00500-optimized.cl
+++ b/OpenCL/m00500-optimized.cl
@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct md5crypt_tmp
 {
--- a/OpenCL/m00500-pure.cl
+++ b/OpenCL/m00500-pure.cl
@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct md5crypt_tmp
 {
--- a/OpenCL/m01500_a3-pure.cl
+++ b/OpenCL/m01500_a3-pure.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single_bs.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi_bs.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single_bs.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi_bs.cl)

 #ifdef IS_NV
 #define KXX_DECL
--- a/OpenCL/m01600-optimized.cl
+++ b/OpenCL/m01600-optimized.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct md5crypt_tmp
 {
--- a/OpenCL/m01600-pure.cl
+++ b/OpenCL/m01600-pure.cl
@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct md5crypt_tmp
 {
--- a/OpenCL/m01800-optimized.cl
+++ b/OpenCL/m01800-optimized.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define PUTCHAR64_BE(a,p,c) ((PRIVATE_AS u8 *)(a))[(p) ^ 7] = (u8) (c)
 #define GETCHAR64_BE(a,p)   ((PRIVATE_AS u8 *)(a))[(p) ^ 7]
--- a/OpenCL/m01800-pure.cl
+++ b/OpenCL/m01800-pure.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct sha512crypt_tmp
 {
--- a/OpenCL/m02100-pure.cl
+++ b/OpenCL/m02100-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct dcc2_tmp
 {
--- a/OpenCL/m02500-pure.cl
+++ b/OpenCL/m02500-pure.cl
@ -27,8 +27,8 @@
 #include "inc_cipher_aes.h"
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct wpa_eapol
 {
--- a/OpenCL/m03000_a3-pure.cl
+++ b/OpenCL/m03000_a3-pure.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single_bs.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi_bs.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single_bs.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi_bs.cl)

 #ifdef IS_NV
 #define KXX_DECL
--- a/OpenCL/m03200-pure.cl
+++ b/OpenCL/m03200-pure.cl
@ -10,8 +10,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct bcrypt_tmp
 {
--- a/OpenCL/m05200-pure.cl
+++ b/OpenCL/m05200-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pwsafe3_tmp
 {
--- a/OpenCL/m05800-optimized.cl
+++ b/OpenCL/m05800-optimized.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct androidpin_tmp
 {
--- a/OpenCL/m05800-pure.cl
+++ b/OpenCL/m05800-pure.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct androidpin_tmp
 {
--- a/OpenCL/m06300-optimized.cl
+++ b/OpenCL/m06300-optimized.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct md5crypt_tmp
 {
--- a/OpenCL/m06300-pure.cl
+++ b/OpenCL/m06300-pure.cl
@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct md5crypt_tmp
 {
--- a/OpenCL/m06400-pure.cl
+++ b/OpenCL/m06400-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct sha256aix_tmp
 {
--- a/OpenCL/m06500-pure.cl
+++ b/OpenCL/m06500-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct sha512aix_tmp
 {
--- a/OpenCL/m06600-pure.cl
+++ b/OpenCL/m06600-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct agilekey_tmp
 {
--- a/OpenCL/m06700-pure.cl
+++ b/OpenCL/m06700-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct sha1aix_tmp
 {
--- a/OpenCL/m06800-pure.cl
+++ b/OpenCL/m06800-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct lastpass_tmp
 {
--- a/OpenCL/m07100-pure.cl
+++ b/OpenCL/m07100-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha512_tmp
 {
--- a/OpenCL/m07400-optimized.cl
+++ b/OpenCL/m07400-optimized.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MIN(a,b) (((a) < (b)) ? (a) : (b))

--- a/OpenCL/m07400-pure.cl
+++ b/OpenCL/m07400-pure.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct sha256crypt_tmp
 {
--- a/OpenCL/m07900-pure.cl
+++ b/OpenCL/m07900-pure.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct drupal7_tmp
 {
--- a/OpenCL/m08200-pure.cl
+++ b/OpenCL/m08200-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha512_tmp
 {
--- a/OpenCL/m08900-pure.cl
+++ b/OpenCL/m08900-pure.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct
 {
--- a/OpenCL/m09000-pure.cl
+++ b/OpenCL/m09000-pure.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pwsafe2_tmp
 {
--- a/OpenCL/m09100-pure.cl
+++ b/OpenCL/m09100-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct lotus8_tmp
 {
--- a/OpenCL/m09400-pure.cl
+++ b/OpenCL/m09400-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct office2007_tmp
 {
--- a/OpenCL/m09500-pure.cl
+++ b/OpenCL/m09500-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct office2010
 {
--- a/OpenCL/m09600-pure.cl
+++ b/OpenCL/m09600-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct office2013_tmp
 {
--- a/OpenCL/m10300-pure.cl
+++ b/OpenCL/m10300-pure.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct saph_sha1_tmp
 {
--- a/OpenCL/m10500-pure.cl
+++ b/OpenCL/m10500-pure.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_rc4.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pdf
 {
--- a/OpenCL/m10700-optimized.cl
+++ b/OpenCL/m10700-optimized.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #if defined IS_AMD && defined IS_GPU
 #define HC_INLINE
--- a/OpenCL/m10700-pure.cl
+++ b/OpenCL/m10700-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define PUTCHAR(a,p,c)    ((PRIVATE_AS u8 *)(a))[(p)] = (u8) (c)
 #define GETCHAR(a,p)      ((PRIVATE_AS u8 *)(a))[(p)]
--- a/OpenCL/m10900-pure.cl
+++ b/OpenCL/m10900-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha256_tmp
 {
--- a/OpenCL/m11900-pure.cl
+++ b/OpenCL/m11900-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_md5
 {
--- a/OpenCL/m12000-pure.cl
+++ b/OpenCL/m12000-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha1_tmp
 {
--- a/OpenCL/m12200-pure.cl
+++ b/OpenCL/m12200-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct ecryptfs_tmp
 {
--- a/OpenCL/m12300-pure.cl
+++ b/OpenCL/m12300-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct oraclet_tmp
 {
--- a/OpenCL/m12400-pure.cl
+++ b/OpenCL/m12400-pure.cl
@ -10,8 +10,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct bsdicrypt_tmp
 {
--- a/OpenCL/m12500-optimized.cl
+++ b/OpenCL/m12500-optimized.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define ROUNDS 0x40000

--- a/OpenCL/m12500-pure.cl
+++ b/OpenCL/m12500-pure.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define ROUNDS 0x40000

--- a/OpenCL/m12700-pure.cl
+++ b/OpenCL/m12700-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct mywallet_tmp
 {
--- a/OpenCL/m12800-pure.cl
+++ b/OpenCL/m12800-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha256_tmp
 {
--- a/OpenCL/m12900-pure.cl
+++ b/OpenCL/m12900-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha256_tmp
 {
--- a/OpenCL/m13000-pure.cl
+++ b/OpenCL/m13000-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha256_tmp
 {
--- a/OpenCL/m13400-pure.cl
+++ b/OpenCL/m13400-pure.cl
@ -13,8 +13,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_twofish.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct keepass_tmp
 {
--- a/OpenCL/m13600-pure.cl
+++ b/OpenCL/m13600-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha1_tmp
 {
--- a/OpenCL/m14000_a3-pure.cl
+++ b/OpenCL/m14000_a3-pure.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_common.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single_bs.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi_bs.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single_bs.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi_bs.cl)

 #ifdef IS_NV
 #define KXX_DECL
--- a/OpenCL/m14611-pure.cl
+++ b/OpenCL/m14611-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14612-pure.cl
+++ b/OpenCL/m14612-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_serpent.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14613-pure.cl
+++ b/OpenCL/m14613-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_twofish.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14621-pure.cl
+++ b/OpenCL/m14621-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14622-pure.cl
+++ b/OpenCL/m14622-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_serpent.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14623-pure.cl
+++ b/OpenCL/m14623-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_twofish.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14631-pure.cl
+++ b/OpenCL/m14631-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14632-pure.cl
+++ b/OpenCL/m14632-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_serpent.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14633-pure.cl
+++ b/OpenCL/m14633-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_twofish.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14641-pure.cl
+++ b/OpenCL/m14641-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14642-pure.cl
+++ b/OpenCL/m14642-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_serpent.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14643-pure.cl
+++ b/OpenCL/m14643-pure.cl
@ -90,8 +90,8 @@ typedef struct luks_tmp
 #include M2S(INCLUDE_PATH/inc_luks_twofish.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define MAX_ENTROPY 7.0

--- a/OpenCL/m14700-pure.cl
+++ b/OpenCL/m14700-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct itunes_backup
 {
--- a/OpenCL/m15100-pure.cl
+++ b/OpenCL/m15100-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf1_sha1_tmp
 {
--- a/OpenCL/m15300-pure.cl
+++ b/OpenCL/m15300-pure.cl
@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_des.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct dpapimk
 {
--- a/OpenCL/m15600-pure.cl
+++ b/OpenCL/m15600-pure.cl
@ -31,8 +31,8 @@ typedef struct ethereum_pbkdf2

 } ethereum_pbkdf2_t;

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 CONSTANT_VK u64a keccakf_rndc[24] =
 {
--- a/OpenCL/m15700-pure.cl
+++ b/OpenCL/m15700-pure.cl
@ -11,8 +11,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct
 {
--- a/OpenCL/m15900-pure.cl
+++ b/OpenCL/m15900-pure.cl
@ -17,8 +17,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct dpapimk_tmp_v2
 {
--- a/OpenCL/m16200-pure.cl
+++ b/OpenCL/m16200-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct apple_secure_notes_tmp
 {
--- a/OpenCL/m16300-pure.cl
+++ b/OpenCL/m16300-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct ethereum_presale
 {
--- a/OpenCL/m16800-pure.cl
+++ b/OpenCL/m16800-pure.cl
@ -21,8 +21,8 @@
 #include "inc_hash_sha1.h"
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct wpa_pbkdf2_tmp
 {
--- a/OpenCL/m16801-pure.cl
+++ b/OpenCL/m16801-pure.cl
@ -21,8 +21,8 @@
 #include "inc_hash_sha1.h"
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct wpa_pmk_tmp
 {
--- a/OpenCL/m16900-pure.cl
+++ b/OpenCL/m16900-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct pbkdf2_sha256_tmp
 {
--- a/OpenCL/m18300-pure.cl
+++ b/OpenCL/m18300-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct apple_secure_notes_tmp
 {
--- a/OpenCL/m18400-pure.cl
+++ b/OpenCL/m18400-pure.cl
@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct odf12_tmp
 {
--- a/OpenCL/m18600-pure.cl
+++ b/OpenCL/m18600-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct odf11_tmp
 {
--- a/OpenCL/m18800-pure.cl
+++ b/OpenCL/m18800-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct bsp_tmp
 {
--- a/OpenCL/m18900-pure.cl
+++ b/OpenCL/m18900-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct android_backup_tmp
 {
--- a/OpenCL/m19000-pure.cl
+++ b/OpenCL/m19000-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_md5.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct qnx_md5_tmp
 {
--- a/OpenCL/m19100-pure.cl
+++ b/OpenCL/m19100-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct qnx_sha256_tmp
 {
--- a/OpenCL/m19200-pure.cl
+++ b/OpenCL/m19200-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct qnx_sha512_tmp
 {
--- a/OpenCL/m20600-pure.cl
+++ b/OpenCL/m20600-pure.cl
@ -16,8 +16,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct omt_sha256_tmp
 {
--- a/OpenCL/m21500-pure.cl
+++ b/OpenCL/m21500-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct solarwinds_tmp
 {
--- a/OpenCL/m21600-pure.cl
+++ b/OpenCL/m21600-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct web2py_sha512_tmp
 {
--- a/OpenCL/m21700-pure.cl
+++ b/OpenCL/m21700-pure.cl
@ -16,7 +16,7 @@
 #include M2S(INCLUDE_PATH/inc_ecc_secp256k1.cl)
 #endif

-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct electrum
 {
--- a/OpenCL/m22000-pure.cl
+++ b/OpenCL/m22000-pure.cl
@ -27,8 +27,8 @@
 #include "inc_cipher_aes.h"
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct wpa_pbkdf2_tmp
 {
--- a/OpenCL/m22001-pure.cl
+++ b/OpenCL/m22001-pure.cl
@ -27,8 +27,8 @@
 #include "inc_cipher_aes.h"
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct wpa_pmk_tmp
 {
--- a/OpenCL/m22400-pure.cl
+++ b/OpenCL/m22400-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct aescrypt
 {
--- a/OpenCL/m22700-pure.cl
+++ b/OpenCL/m22700-pure.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 // fixed MultiBit salt (not a bug)

--- a/OpenCL/m23200-pure.cl
+++ b/OpenCL/m23200-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct xmpp_tmp
 {
--- a/OpenCL/m23400-pure.cl
+++ b/OpenCL/m23400-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct bitwarden_tmp
 {
--- a/OpenCL/m23700-optimized.cl
+++ b/OpenCL/m23700-optimized.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define ROUNDS 0x40000

--- a/OpenCL/m23700-pure.cl
+++ b/OpenCL/m23700-pure.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define ROUNDS 0x40000

--- a/OpenCL/m23800-optimized.cl
+++ b/OpenCL/m23800-optimized.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define ROUNDS 0x40000

--- a/OpenCL/m23800-pure.cl
+++ b/OpenCL/m23800-pure.cl
@ -12,8 +12,8 @@
 #include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 #define ROUNDS 0x40000

--- a/OpenCL/m24100-pure.cl
+++ b/OpenCL/m24100-pure.cl
@ -15,8 +15,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct mongodb_sha1_tmp
 {
--- a/OpenCL/m24200-pure.cl
+++ b/OpenCL/m24200-pure.cl
@ -14,8 +14,8 @@
 #include M2S(INCLUDE_PATH/inc_hash_sha256.cl)
 #endif

-#define COMPARE_S STR(INCLUDE_PATH/inc_comp_single.cl)
-#define COMPARE_M STR(INCLUDE_PATH/inc_comp_multi.cl)
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)

 typedef struct mongodb_sha256_tmp
 {
--- a/Show More
+++ b/Show More