diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/include/fxcrt/fx_stream.h | 4 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_system.h | 1 | ||||
| -rw-r--r-- | core/include/fxge/fpf.h | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h index 67327898d9..73bb8a72fe 100644 --- a/core/include/fxcrt/fx_stream.h +++ b/core/include/fxcrt/fx_stream.h @@ -16,7 +16,9 @@ FX_BOOL FX_GetNextFile(void* handle, CFX_ByteString& filename, FX_BOOL& bFolder) FX_BOOL FX_GetNextFile(void* handle, CFX_WideString& filename, FX_BOOL& bFolder); void FX_CloseFolder(void* handle); FX_WCHAR FX_GetFolderSeparator(); -FX_DEFINEHANDLE(FX_HFILE) +typedef struct FX_HFILE_ { + FX_LPVOID pData; +}* FX_HFILE; #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #define FX_FILESIZE FX_INT32 #else diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index d030bf70d6..ce86d5ad5c 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -110,7 +110,6 @@ typedef wchar_t* FX_LPWSTR; typedef wchar_t const* FX_LPCWSTR; typedef FX_DWORD FX_UINT32; typedef FX_UINT64 FX_QWORD; -#define FX_DEFINEHANDLE(name) typedef struct _##name {FX_LPVOID pData;} * name; #if defined(DEBUG) && !defined(_DEBUG) #define _DEBUG #endif diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h index 28d028cfbb..9fb38f8043 100644 --- a/core/include/fxge/fpf.h +++ b/core/include/fxge/fpf.h @@ -18,7 +18,9 @@ public: }; IFPF_DeviceModule* FPF_GetDeviceModule(); #define FPF_MATCHFONT_REPLACEANSI 1 -FX_DEFINEHANDLE(FPF_HFONT); +typedef struct FPF_HFONT_ { + FX_LPVOID pData; +}* FPF_HFONT; class IFPF_Font { public: |