diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl index a1d88e56aab..68839eb4f33 100644 --- a/src/Common/PlatformLinux.inl +++ b/src/Common/PlatformLinux.inl @@ -52,25 +52,25 @@ #define CALLBACK #define TEXT(x) strdup(x) -inline char *_strlwr_l(char *str, locale_t loc) +inline char* _strlwr_l(char* str, locale_t loc) { //TODO } -inline char *_strupr_l(char *str, locale_t loc) +inline char* _strupr_l(char* str, locale_t loc) { //TODO } #define VOID void -#define HKL void * +#define HKL void* #define ActivateKeyboardLayout(x, y) {} #define ScreenToClient(hwnd, p) {} #define __except(X) catch(X) /* -static inline long InterlockedExchange(volatile long *val, long new_val) +static inline long InterlockedExchange(volatile long* val, long new_val) { long old_val; do { @@ -91,11 +91,11 @@ inline void Sleep(int ms) } inline void _splitpath ( - const char *path, // Path Input - char *drive, // Drive : Output - char *dir, // Directory : Output - char *fname, // Filename : Output - char *ext // Extension : Output + const char* path, // Path Input + char* drive, // Drive : Output + char* dir, // Directory : Output + char* fname, // Filename : Output + char* ext // Extension : Output ){} inline unsigned long GetLastError() @@ -130,8 +130,8 @@ typedef unsigned short WORD; typedef unsigned short* LPWORD; typedef unsigned long DWORD; typedef unsigned long* LPDWORD; -typedef const void *LPCVOID; -typedef long long int *PLARGE_INTEGER; +typedef const void* LPCVOID; +typedef long long int* PLARGE_INTEGER; typedef wchar_t WCHAR; @@ -183,17 +183,17 @@ typedef long LONG_PTR; #endif // XR_X64 typedef int HANDLE; -typedef void *HMODULE; -typedef void *LPVOID; +typedef void* HMODULE; +typedef void* LPVOID; typedef UINT_PTR WPARAM; typedef LONG_PTR LPARAM; typedef long HRESULT; typedef long LRESULT; typedef long _W64; -//typedef void *HWND; -typedef SDL_Window *HWND; -typedef void *HDC; -//typedef void *HGLRC; +//typedef void* HWND; +typedef SDL_Window* HWND; +typedef void* HDC; +//typedef void* HGLRC; typedef SDL_GLContext HGLRC; typedef float FLOAT; typedef unsigned char UINT8; diff --git a/src/editors/xrEditor/entry_point.cpp b/src/editors/xrEditor/entry_point.cpp index 18fc39dc853..be06e9519f0 100644 --- a/src/editors/xrEditor/entry_point.cpp +++ b/src/editors/xrEditor/entry_point.cpp @@ -26,7 +26,7 @@ void UIThreadProc(void*) Core.Initialize("OpenXRayEditor", LogCallback(ELogCallback, windowIDE->Log().Handle.ToPointer()), true); #ifdef XR_X64 - Device.m_sdlWnd = (SDL_Window *)windowIDE->View().GetViewHandle().ToInt64(); + Device.m_sdlWnd = (SDL_Window*)windowIDE->View().GetViewHandle().ToInt64(); #else Device.m_sdlWnd = (SDL_Window*)windowIDE->View().GetViewHandle().ToInt32(); #endif diff --git a/src/xrEngine/IInputReceiver.cpp b/src/xrEngine/IInputReceiver.cpp index 648d388ec36..b2093c7342d 100644 --- a/src/xrEngine/IInputReceiver.cpp +++ b/src/xrEngine/IInputReceiver.cpp @@ -55,7 +55,7 @@ void IInputReceiver::IR_GetMousePosScreen(Ivector2& p) SDL_GetMouseState(&p.x, &p.y); } -void IInputReceiver::IR_GetMousePosReal(SDL_Window *m_sdlWnd, Ivector2& p) +void IInputReceiver::IR_GetMousePosReal(SDL_Window* m_sdlWnd, Ivector2& p) { IR_GetMousePosScreen(p); } diff --git a/src/xrEngine/IInputReceiver.h b/src/xrEngine/IInputReceiver.h index 57bf9209b92..c252a02eb0d 100644 --- a/src/xrEngine/IInputReceiver.h +++ b/src/xrEngine/IInputReceiver.h @@ -19,7 +19,7 @@ class ENGINE_API IInputReceiver public: static void IR_GetLastMouseDelta(Ivector2& p); static void IR_GetMousePosScreen(Ivector2& p); - static void IR_GetMousePosReal(SDL_Window *m_sdlWnd, Ivector2& p); + static void IR_GetMousePosReal(SDL_Window* m_sdlWnd, Ivector2& p); static void IR_GetMousePosReal(Ivector2& p); static void IR_GetMousePosIndependent(Fvector2& f); static void IR_GetMousePosIndependentCrop(Fvector2& f);