Muldersoft/SlunkCrypt
Muldersoft/SlunkCrypt
1
0
Fork 0
Code Releases 6 Activity

Workaround for Intel® oneAPI DPC++/C++ Compiler detection.

Browse Source
This commit is contained in:
LoRd_MuldeR 2021-04-11 17:38:09 +02:00
parent a9e1974149
commit 772c88a387
Signed by: mulder
GPG Key ID: 2B5913365F57E03F
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -696,7 +696,7 @@ These variables can be used to determine the version of the SlunkCrypt library a
* `const uint16_t SLUNKCRYPT_VERSION_MAJOR` – The current *major* version. * `const uint16_t SLUNKCRYPT_VERSION_MAJOR` – The current *major* version.
* `const uint16_t SLUNKCRYPT_VERSION_MINOR` – The current *minor* version. * `const uint16_t SLUNKCRYPT_VERSION_MINOR` – The current *minor* version.
* `const uint16_t SLUNKCRYPT_VERSION_PATCH` – The current *patch* version. * `const uint16_t SLUNKCRYPT_VERSION_PATCH` – The current *patch* version.
* `const char *SLUNKCRYPT_BUILD` – The build date and time, as a C string, in the *"mmm dd yyyy hh:mm:ss"* format. * `const char *SLUNKCRYPT_BUILD` – The build date and time, as a C string, in the *`"mmm dd yyyy, hh:mm:ss"`* format.
#### Abort request #### Abort request

6
frontend/res/version.rc
View File

@ -10,7 +10,7 @@
#define VERSION_HELPER1(X,Y,Z) #X "." #Y "." #Z #define VERSION_HELPER1(X,Y,Z) #X "." #Y "." #Z
#define VERSION_HELPER2(X,Y,Z) VERSION_HELPER1(X,Y,Z) #define VERSION_HELPER2(X,Y,Z) VERSION_HELPER1(X,Y,Z)
#define VERSION_STRING VERSION_HELPER2(MY_VERSION_MAJOR,MY_VERSION_MINOR,MY_VERSION_PATCH) #define VERSION_STRING VERSION_HELPER2(LIB_VERSION_MAJOR,LIB_VERSION_MINOR,LIB_VERSION_PATCH)
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
@ -26,8 +26,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
// Version // Version
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION MY_VERSION_MAJOR,MY_VERSION_MINOR,0,MY_VERSION_PATCH FILEVERSION LIB_VERSION_MAJOR,LIB_VERSION_MINOR,0,LIB_VERSION_PATCH
PRODUCTVERSION MY_VERSION_MAJOR,MY_VERSION_MINOR,0,MY_VERSION_PATCH PRODUCTVERSION LIB_VERSION_MAJOR,LIB_VERSION_MINOR,0,LIB_VERSION_PATCH
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x3L FILEFLAGS 0x3L

15
libslunkcrypt/src/slunkcrypt.c
View File

@ -12,8 +12,13 @@
#include <limits.h> #include <limits.h>
#include <assert.h> #include <assert.h>
/* Intel(R) oneAPI DPC++/C++ Compiler */
#if defined(__INTEL_LLVM_COMPILER) && (!defined(__GNUC__))
# define __GNUC__ 9
#endif
/* Compiler compatibility */ /* Compiler compatibility */
#if defined(_MSC_VER) #if defined(_MSC_VER) && (!defined(__GNUC__))
# define FORCE_INLINE __forceinline # define FORCE_INLINE __forceinline
# define UNUSED __pragma(warning(suppress: 4189)) # define UNUSED __pragma(warning(suppress: 4189))
#elif defined(__GNUC__) #elif defined(__GNUC__)
@ -25,10 +30,10 @@
#endif #endif
/* Version info */ /* Version info */
const uint16_t SLUNKCRYPT_VERSION_MAJOR = MY_VERSION_MAJOR; const uint16_t SLUNKCRYPT_VERSION_MAJOR = LIB_VERSION_MAJOR;
const uint16_t SLUNKCRYPT_VERSION_MINOR = MY_VERSION_MINOR; const uint16_t SLUNKCRYPT_VERSION_MINOR = LIB_VERSION_MINOR;
const uint16_t SLUNKCRYPT_VERSION_PATCH = MY_VERSION_PATCH; const uint16_t SLUNKCRYPT_VERSION_PATCH = LIB_VERSION_PATCH;
const char *const SLUNKCRYPT_BUILD = __DATE__ " " __TIME__; const char *const SLUNKCRYPT_BUILD = __DATE__ ", " __TIME__;
/* Utilities */ /* Utilities */
#define BOOLIFY(X) (!!(X)) #define BOOLIFY(X) (!!(X))

6
libslunkcrypt/src/version.h
View File

@ -6,8 +6,8 @@
#ifndef INC_SLUNKCRYPT_VERSION_H #ifndef INC_SLUNKCRYPT_VERSION_H
#define INC_SLUNKCRYPT_VERSION_H #define INC_SLUNKCRYPT_VERSION_H
#define MY_VERSION_MAJOR 1 #define LIB_VERSION_MAJOR 1
#define MY_VERSION_MINOR 0 #define LIB_VERSION_MINOR 0
#define MY_VERSION_PATCH 0 #define LIB_VERSION_PATCH 0
#endif #endif