Author: tkreuzer Date: Fri Apr 9 16:58:27 2010 New Revision: 46792
URL: http://svn.reactos.org/svn/reactos?rev=46792&view=rev Log: merge 46604 from trunk
Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug.c branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug_ros.c
Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3r... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug.c [iso-8859-1] Fri Apr 9 16:58:27 2010 @@ -262,7 +262,7 @@ char *ret; int idx;
- idx = InterlockedExchangeAdd( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); + idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0])); if ((ret = realloc( list[idx], size ))) list[idx] = ret; return ret; }
Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug_ros.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3r... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/libwine/debug_ros.c [iso-8859-1] Fri Apr 9 16:58:27 2010 @@ -5,6 +5,7 @@ #define free libwine_free #define realloc libwine_realloc #define _strdup libwine__strdup +#define interlocked_xchg_add InterlockedExchangeAdd
#include "debug.c"