aboutsummaryrefslogtreecommitdiffstats
path: root/compat/w32pthreads.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-19 10:56:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-19 10:56:10 +0200
commitc88503e3f6bd7881f147d340bf222a629daa55fc (patch)
treeb8feb316bc6924f9b648b7e57f6faa1dd6afe248 /compat/w32pthreads.h
parent8740762c43dc92cfefa58769bb8cfade82aa695c (diff)
parent439902e0d68a0f0d800c21b5e6b598d5fa0c51da (diff)
downloadffmpeg-c88503e3f6bd7881f147d340bf222a629daa55fc.tar.gz
Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'
* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da': Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/ Conflicts: compat/aix/math.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/w32pthreads.h')
-rw-r--r--compat/w32pthreads.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h
index 71c1da6abf..71806cc798 100644
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -26,8 +26,8 @@
* w32threads to pthreads wrapper
*/
-#ifndef LIBAV_W32PTHREADS_H
-#define LIBAV_W32PTHREADS_H
+#ifndef FFMPEG_COMPAT_W32PTHREADS_H
+#define FFMPEG_COMPAT_W32PTHREADS_H
/* Build up a pthread-like API using underlying Windows API. Have only static
* methods so as to not conflict with a potentially linked in pthread-win32
@@ -277,4 +277,4 @@ static void w32thread_init(void)
}
-#endif /* LIBAV_W32PTHREADS_H */
+#endif /* FFMPEG_COMPAT_W32PTHREADS_H */