https://git.reactos.org/?p=reactos.git;a=commitdiff;h=302c4ae0ca06b7dd6b8c9a...
commit 302c4ae0ca06b7dd6b8c9ab01f10f6820267047c Author: Amine Khaldi amine.khaldi@reactos.org AuthorDate: Fri Mar 23 12:32:12 2018 +0100 Commit: Amine Khaldi amine.khaldi@reactos.org CommitDate: Fri Mar 23 12:32:12 2018 +0100
[TRAFFIC] Sync with Wine Staging 3.3. CORE-14434 --- dll/win32/traffic/traffic_main.c | 10 ++++------ media/doc/README.WINE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/dll/win32/traffic/traffic_main.c b/dll/win32/traffic/traffic_main.c index e598901005..6b8a9751e1 100644 --- a/dll/win32/traffic/traffic_main.c +++ b/dll/win32/traffic/traffic_main.c @@ -17,14 +17,12 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WIN32_NO_STATUS - #include <stdarg.h>
-#include <windef.h> -#include <winbase.h> -#include <traffic.h> -#include <wine/debug.h> +#include "windef.h" +#include "winbase.h" +#include "traffic.h" +#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(traffic);
diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 10480ed1c0..5576071605 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -184,7 +184,7 @@ reactos/dll/win32/sti # Synced to WineStaging-3.3 reactos/dll/win32/sxs # Synced to WineStaging-3.3 reactos/dll/win32/t2embed # Synced to WineStaging-3.3 reactos/dll/win32/tapi32 # Synced to WineStaging-3.3 -reactos/dll/win32/traffic # Synced to WineStaging-2.9 +reactos/dll/win32/traffic # Synced to WineStaging-3.3 reactos/dll/win32/twain_32 # Synced to Wine-3.0 reactos/dll/win32/updspapi # Synced to WineStaging-2.9 reactos/dll/win32/url # Synced to WineStaging-2.9