diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-24 09:27:36 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-24 09:27:36 +0000 |
| commit | 7a45d135e355d566cf9dc8ac46678f5b2e3a5f58 (patch) | |
| tree | 4b976307d21d278c0e29b06f6d4bbe9df495848f | |
| parent | 72e8e4bc6a04ec0cd9a1ee1aceeadf5796940c6f (diff) | |
- compilation fix
- warning fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@13811 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/Pcre16/src/pcre.h | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/commonheaders.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/plugins/Pcre16/src/pcre.h b/plugins/Pcre16/src/pcre.h index 58ed46a2a3..962f6f22db 100644 --- a/plugins/Pcre16/src/pcre.h +++ b/plugins/Pcre16/src/pcre.h @@ -343,7 +343,7 @@ typedef struct real_pcre32_jit_stack pcre32_jit_stack; a 16 bit wide signed data type. Otherwise it can be a dummy data type since pcre16 functions are not implemented. There is a check for this in pcre_internal.h. */ #ifndef PCRE_UCHAR16 -#define PCRE_UCHAR16 unsigned short +#define PCRE_UCHAR16 wchar_t #endif #ifndef PCRE_SPTR16 diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index 2348a06b5d..2645d39356 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -89,8 +89,6 @@ using namespace std; * UserInfoEx plugin includes and macros
***********************************************************************************************************/
-#pragma intrinsic(memcmp, memcpy, memset, mir_strcmp, mir_strlen)
-
#ifndef MIR_OK
#define MIR_OK 0 // success value of a miranda service function
#define MIR_FAIL 1 // general failure value of a miranda service function
|