RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-07 23:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

Browse source 
Conflicts:
	Utilities/BEType.h
This commit is contained in:
Aishou 2014-02-28 19:55:48 +01:00
commit 377db4515a
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Utilities/BEType.h
View file

@ -50,10 +50,11 @@ class be_t
public:
typedef T type;
#ifdef __GNUG__
be_t() noexcept = default;
#else
#ifdef _WIN32
be_t(){}
#else
be_t() noexcept = default
#endif
be_t(const T& value)

2
Utilities/GNU.h
View file

@ -15,5 +15,5 @@
#define InterlockedCompareExchange64(ptr,new_val,old_val) __sync_val_compare_and_swap(ptr,old_val,new_val)
#define _aligned_malloc(size,alignment) aligned_alloc(alignment,size)
#define _aligned_free(pointer) free(pointer)
#define DWORD int64_t
#define DWORD int32_t
#endif