Skip to content

fix IDL for oopjit #2366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2017
Merged

fix IDL for oopjit #2366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/Backend/Backend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ enum IRDumpFlags
// BackEnd includes
//

#ifdef _WIN32
#include "../JITIDL/JITTypes.h"
#endif
#include "JITTimeProfileInfo.h"
#include "JITRecyclableObject.h"
#include "JITTimeFixedField.h"
Expand Down
10 changes: 2 additions & 8 deletions lib/JITIDL/JITTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,17 @@ import "wtypes.idl";
#define IDL_DEF(def)
#endif

#if defined(__midl)
#define IDL_PAD1(num) byte struct_pad_##num;
#define IDL_PAD2(num) short struct_pad_##num;
#define IDL_PAD4(num) int struct_pad_##num;
#else
#define IDL_PAD1(num)
#define IDL_PAD2(num)
#define IDL_PAD4(num)
#endif

#if defined(__midl) && (defined(_M_X64) || defined(_M_ARM64))
#if defined(_M_X64) || defined(_M_ARM64)
#define X64_PAD4(num) int struct_pad_##num;
#else
#define X64_PAD4(num)
#endif

#if defined(__midl) && (defined(_M_IX86) || defined(_M_ARM))
#if defined(_M_IX86) || defined(_M_ARM)
#define X86_PAD4(num) int struct_pad_##num;
#else
#define X86_PAD4(num)
Expand Down