[ros-diffs] [tkreuzer] 35666: #undef Interlocked before implementing the functions on all architectures.
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Tue Aug 26 13:22:31 CEST 2008
Author: tkreuzer
Date: Tue Aug 26 06:22:30 2008
New Revision: 35666
URL: http://svn.reactos.org/svn/reactos?rev=35666&view=rev
Log:
#undef Interlocked before implementing the functions on all architectures.
Modified:
branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c
Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c?rev=35666&r1=35665&r2=35666&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/dllmain.c [iso-8859-1] Tue Aug 26 06:22:30 2008
@@ -394,29 +394,23 @@
return TRUE;
}
-//wtf
-#ifdef _WIN64
#undef InterlockedIncrement
+LONG
+WINAPI
+InterlockedIncrement(IN OUT LONG volatile *lpAddend)
+{
+ return _InterlockedIncrement(lpAddend);
+}
+
#undef InterlockedDecrement
+LONG
+WINAPI
+InterlockedDecrement(IN OUT LONG volatile *lpAddend)
+{
+ return _InterlockedDecrement(lpAddend);
+}
+
#undef InterlockedExchange
-#undef InterlockedExchangeAdd
-#undef InterlockedCompareExchange
-#endif
-
-LONG
-WINAPI
-InterlockedIncrement(IN OUT LONG volatile *lpAddend)
-{
- return _InterlockedIncrement(lpAddend);
-}
-
-LONG
-WINAPI
-InterlockedDecrement(IN OUT LONG volatile *lpAddend)
-{
- return _InterlockedDecrement(lpAddend);
-}
-
LONG
WINAPI
InterlockedExchange(IN OUT LONG volatile *Target,
@@ -425,6 +419,7 @@
return _InterlockedExchange(Target, Value);
}
+#undef InterlockedExchangeAdd
LONG
WINAPI
InterlockedExchangeAdd(IN OUT LONG volatile *Addend,
@@ -433,6 +428,7 @@
return _InterlockedExchangeAdd(Addend, Value);
}
+#undef InterlockedCompareExchange
LONG
WINAPI
InterlockedCompareExchange(IN OUT LONG volatile *Destination,
More information about the Ros-diffs
mailing list