ffmpeg | branch: master | Hendrik Leppkes <h.lepp...@gmail.com> | Tue Apr  4 
09:33:23 2017 +0200| [9ac1e884365314765f75517e91563be0351f6bd1] | committer: 
Hendrik Leppkes

stdatomic/win32: only include the lean windows headers to avoid conflicts

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ac1e884365314765f75517e91563be0351f6bd1
---

 compat/atomics/win32/stdatomic.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compat/atomics/win32/stdatomic.h b/compat/atomics/win32/stdatomic.h
index fa7ef51..092f453 100644
--- a/compat/atomics/win32/stdatomic.h
+++ b/compat/atomics/win32/stdatomic.h
@@ -19,6 +19,7 @@
 #ifndef COMPAT_ATOMICS_WIN32_STDATOMIC_H
 #define COMPAT_ATOMICS_WIN32_STDATOMIC_H
 
+#define WIN32_LEAN_AND_MEAN
 #include <stddef.h>
 #include <stdint.h>
 #include <windows.h>

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to