diff options
| author | Haruna <haru@dotalux.com> | 2014-05-30 04:42:58 +0200 |
|---|---|---|
| committer | Haruna <haru@dotalux.com> | 2014-05-30 04:42:58 +0200 |
| commit | 3def3af50a09d934f7a288e930aa3376b8c2d02f (patch) | |
| tree | 1d683555f1567d429f0b21cad578bfb1629f22b0 /src/common/atomic.h | |
| parent | c3976d24500abc6084a4d96d60ae84c65302e3ae (diff) | |
| parent | 0a4975ed611db7d1bcfe501008085e420e743128 (diff) | |
| download | hercules-3def3af50a09d934f7a288e930aa3376b8c2d02f.tar.gz hercules-3def3af50a09d934f7a288e930aa3376b8c2d02f.tar.bz2 hercules-3def3af50a09d934f7a288e930aa3376b8c2d02f.tar.xz hercules-3def3af50a09d934f7a288e930aa3376b8c2d02f.zip | |
Merge pull request #282 from MrKeiKun/fix_typo
Fixed some typo
Diffstat (limited to 'src/common/atomic.h')
| -rw-r--r-- | src/common/atomic.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/atomic.h b/src/common/atomic.h index 1349d0887..526811a09 100644 --- a/src/common/atomic.h +++ b/src/common/atomic.h @@ -12,7 +12,7 @@ // - Compiler // - Operating System // -// our Abstraction is fully API-Compatible to Microsofts implementation @ NT5.0+ +// our Abstraction is fully API-Compatible to Microsoft's implementation @ NT5.0+ // #include "../common/cbasetypes.h" @@ -23,7 +23,7 @@ #if _MSC_VER < 1800 #if !defined(_M_X64) -// When compiling for windows 32bit, the 8byte interlocked operations are not provided by microsoft +// When compiling for windows 32bit, the 8byte interlocked operations are not provided by Microsoft // (because they need at least i586 so its not generic enough.. ... ) forceinline int64 InterlockedCompareExchange64(volatile int64 *dest, int64 exch, int64 _cmp){ _asm{ @@ -143,7 +143,7 @@ static forceinline int32 InterlockedExchange(volatile int32 *target, int32 val){ }//end: InterlockedExchange() -#endif //endif compiler decission +#endif //endif compiler decision #endif /* _COMMON_ATOMIC_H_ */ |