From 090d139b66d11b8f9a33b930277aea8becb7f085 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 4 May 2015 15:18:56 -0700 Subject: Merge to XFA: Kill FX_DEFINEHANDLE Original Review URL: https://codereview.chromium.org/1129433002 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1122903002 --- xfa/include/fxjse/fxjse.h | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'xfa/include') diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h index 0bd44347a4..aeec9af0a0 100644 --- a/xfa/include/fxjse/fxjse.h +++ b/xfa/include/fxjse/fxjse.h @@ -6,16 +6,22 @@ #ifndef _FXJSE_H_ #define _FXJSE_H_ -#ifdef __cplusplus -#define FXJSE_DEFINEINHERITHANDLE(name, subtypename) typedef struct _##subtypename : public _##name {} * subtypename; -#else -#define FXJSE_DEFINEINHERITHANDLE(name, subtypename) typedef name subtypename; -#endif -FX_DEFINEHANDLE(FXJSE_HRUNTIME); -FX_DEFINEHANDLE(FXJSE_HCONTEXT); -FX_DEFINEHANDLE(FXJSE_HCLASS); -FX_DEFINEHANDLE(FXJSE_HVALUE); -FXJSE_DEFINEINHERITHANDLE(FXJSE_HVALUE, FXJSE_HOBJECT); + +typedef struct FXJSE_HRUNTIME_ { + FX_LPVOID pData; +}* FXJSE_HRUNTIME; +typedef struct FXJSE_HCONTEXT_ { + FX_LPVOID pData; +}* FXJSE_HCONTEXT; +typedef struct FXJSE_HCLASS_ { + FX_LPVOID pData; +}* FXJSE_HCLASS; +typedef struct FXJSE_HVALUE_ { + FX_LPVOID pData; +}* FXJSE_HVALUE; +typedef struct FXJSE_HOBJECT_ : public FXJSE_HVALUE_ { +}* FXJSE_HOBJECT; + typedef double FXJSE_DOUBLE; void FXJSE_Initialize(); void FXJSE_Finalize(); -- cgit v1.2.3