Skip to content

Commit d607c79

Browse files
authored
Merge pull request #210 from deeglaze/remove_u_int64_defines
Remove #defines reserved by the C standard Signed-off-by: Zhang Lili Z <[email protected]>
2 parents 3b52908 + f60ac7f commit d607c79

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

external/epid-sdk/ext/ipp/include/ippbase.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,14 @@
3636
extern "C" {
3737
#endif
3838

39+
#include <stdint.h>
40+
3941
#if defined( _WIN32 ) || defined ( _WIN64 )
4042
#define __STDCALL __stdcall
4143
#define __CDECL __cdecl
42-
#define __INT64 __int64
43-
#define __UINT64 unsigned __int64
4444
#else
4545
#define __STDCALL
4646
#define __CDECL
47-
#define __INT64 long long
48-
#define __UINT64 unsigned long long
4947
#endif
5048

5149
#define IPP_PI ( 3.14159265358979323846 ) /* ANSI C does not support M_PI */
@@ -117,8 +115,8 @@ typedef signed char Ipp8s;
117115
typedef signed short Ipp16s;
118116
typedef signed int Ipp32s;
119117
typedef float Ipp32f;
120-
typedef __INT64 Ipp64s;
121-
typedef __UINT64 Ipp64u;
118+
typedef int64_t Ipp64s;
119+
typedef uint64_t Ipp64u;
122120
typedef double Ipp64f;
123121
typedef Ipp16s Ipp16f;
124122

0 commit comments

Comments
 (0)