Skip to content

Commit 8be1710

Browse files
aparshin-intelsys_zuul
authored andcommitted
synchronize portable_windef.h and visa/common.h definitions
Change-Id: I563037c6396a40ff751cafd804c77473281cf9e7
1 parent 5a945a4 commit 8be1710

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

visa/common.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ static errno_t memcpy_s(void* dst, size_t numberOfElements, const void* src, siz
7575
typedef char CHAR;
7676
typedef int INT;
7777
typedef short SHORT;
78-
typedef long LONG;
79-
typedef long long LONGLONG;
78+
typedef int32_t LONG;
79+
typedef int64_t LONGLONG;
8080

8181
typedef uint32_t UINT32;
8282
typedef uint32_t DWORD;
@@ -85,6 +85,7 @@ typedef uint16_t WORD;
8585
typedef double DOUBLE;
8686
typedef float FLOAT;
8787

88+
#ifndef __LARGE_INTEGER_STRUCT_DEFINED
8889
union LARGE_INTEGER {
8990
struct dummy {
9091
DWORD LowPart;
@@ -98,6 +99,7 @@ union LARGE_INTEGER {
9899

99100
LONGLONG QuadPart;
100101
};
102+
#endif /* __LARGE_INTEGER_STRUCT_DEFINED */
101103

102104
#endif /* Windows types for non-Windows end */
103105

0 commit comments

Comments
 (0)