Skip to content

Commit dcac073

Browse files
aparshin-intelsys_zuul
authored andcommitted
additional include guards to avoid re-defintion conflict of LARGE_INTEGER type
Change-Id: Ib7b64c3b22cdfc9ee7a7af2502ad106676fad3b1
1 parent 541bfac commit dcac073

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

inc/common/UFO/portable_windef.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ typedef INT_PTR (*FARPROC)();
172172
#define DUMMYSTRUCTNAME
173173

174174
#ifndef __MEDIA_PORTABLE_DATAYPE_DEFINED__
175+
#ifndef __LARGE_INTEGER_STRUCT_DEFINED__
175176
typedef union _LARGE_INTEGER {
176177
struct {
177178
DWORD LowPart;
@@ -183,7 +184,9 @@ typedef union _LARGE_INTEGER {
183184
} u;
184185
LONGLONG QuadPart;
185186
} LARGE_INTEGER, *PLARGE_INTEGER;
186-
#endif
187+
#define __LARGE_INTEGER_STRUCT_DEFINED__
188+
#endif // __LARGE_INTEGER_STRUCT_DEFINED__
189+
#endif // __MEDIA_PORTABLE_DATAYPE_DEFINED__
187190

188191
typedef union _ULARGE_INTEGER {
189192
struct {

visa/common.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ typedef uint16_t WORD;
8585
typedef double DOUBLE;
8686
typedef float FLOAT;
8787

88-
#ifndef __LARGE_INTEGER_STRUCT_DEFINED
88+
#ifndef __LARGE_INTEGER_STRUCT_DEFINED__
8989
union LARGE_INTEGER {
9090
struct dummy {
9191
DWORD LowPart;
@@ -99,8 +99,8 @@ union LARGE_INTEGER {
9999

100100
LONGLONG QuadPart;
101101
};
102-
#define __LARGE_INTEGER_STRUCT_DEFINED
103-
#endif /* __LARGE_INTEGER_STRUCT_DEFINED */
102+
#define __LARGE_INTEGER_STRUCT_DEFINED__
103+
#endif // __LARGE_INTEGER_STRUCT_DEFINED__
104104

105105
#endif /* Windows types for non-Windows end */
106106

0 commit comments

Comments
 (0)