aboutsummaryrefslogtreecommitdiffstats
path: root/compat
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2016-01-28 18:25:13 -0800
committerTimothy Gu <timothygu99@gmail.com>2016-01-31 15:44:11 -0800
commit180f9a09588d1c68983692bb5245213956fdde11 (patch)
treeacde2f7c3e24f7fab834cfafbeeebfc6b8785b8a /compat
parentdef56677e58de9aaa516a738b6469747662ac372 (diff)
downloadffmpeg-180f9a09588d1c68983692bb5245213956fdde11.tar.gz
all: Make header guard names consistent
Diffstat (limited to 'compat')
-rw-r--r--compat/aix/math.h6
-rw-r--r--compat/msvcrt/snprintf.h6
-rw-r--r--compat/os2threads.h6
-rw-r--r--compat/tms470/math.h6
-rw-r--r--compat/w32pthreads.h6
5 files changed, 15 insertions, 15 deletions
diff --git a/compat/aix/math.h b/compat/aix/math.h
index 65a89c4565..dee13c8dd7 100644
--- a/compat/aix/math.h
+++ b/compat/aix/math.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef FFMPEG_COMPAT_AIX_MATH_H
-#define FFMPEG_COMPAT_AIX_MATH_H
+#ifndef COMPAT_AIX_MATH_H
+#define COMPAT_AIX_MATH_H
#define class class_in_math_h_causes_problems
@@ -28,4 +28,4 @@
#undef class
-#endif /* FFMPEG_COMPAT_AIX_MATH_H */
+#endif /* COMPAT_AIX_MATH_H */
diff --git a/compat/msvcrt/snprintf.h b/compat/msvcrt/snprintf.h
index f02113c5a2..cd47953e87 100644
--- a/compat/msvcrt/snprintf.h
+++ b/compat/msvcrt/snprintf.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef COMPAT_SNPRINTF_H
-#define COMPAT_SNPRINTF_H
+#ifndef COMPAT_MSVCRT_SNPRINTF_H
+#define COMPAT_MSVCRT_SNPRINTF_H
#include <stdarg.h>
#include <stdio.h>
@@ -35,4 +35,4 @@ int avpriv_vsnprintf(char *s, size_t n, const char *fmt, va_list ap);
#define _snprintf avpriv_snprintf
#define vsnprintf avpriv_vsnprintf
-#endif /* COMPAT_SNPRINTF_H */
+#endif /* COMPAT_MSVCRT_SNPRINTF_H */
diff --git a/compat/os2threads.h b/compat/os2threads.h
index f8fb2c8c63..7c0fe13af3 100644
--- a/compat/os2threads.h
+++ b/compat/os2threads.h
@@ -23,8 +23,8 @@
* os2threads to pthreads wrapper
*/
-#ifndef AVCODEC_OS2PTHREADS_H
-#define AVCODEC_OS2PTHREADS_H
+#ifndef COMPAT_OS2THREADS_H
+#define COMPAT_OS2THREADS_H
#define INCL_DOS
#include <os2.h>
@@ -190,4 +190,4 @@ static av_always_inline int pthread_once(pthread_once_t *once_control, void (*in
return 0;
}
-#endif /* AVCODEC_OS2PTHREADS_H */
+#endif /* COMPAT_OS2THREADS_H */
diff --git a/compat/tms470/math.h b/compat/tms470/math.h
index 6234cc597b..0a42743a0b 100644
--- a/compat/tms470/math.h
+++ b/compat/tms470/math.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef FFMPEG_COMPAT_TMS470_MATH_H
-#define FFMPEG_COMPAT_TMS470_MATH_H
+#ifndef COMPAT_TMS470_MATH_H
+#define COMPAT_TMS470_MATH_H
#include_next <math.h>
@@ -27,4 +27,4 @@
#define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 }))
#define NAN (*(const float*)((const unsigned []){ 0x7fc00000 }))
-#endif /* FFMPEG_COMPAT_TMS470_MATH_H */
+#endif /* COMPAT_TMS470_MATH_H */
diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h
index c327962735..4ac2a995b8 100644
--- a/compat/w32pthreads.h
+++ b/compat/w32pthreads.h
@@ -26,8 +26,8 @@
* w32threads to pthreads wrapper
*/
-#ifndef FFMPEG_COMPAT_W32PTHREADS_H
-#define FFMPEG_COMPAT_W32PTHREADS_H
+#ifndef COMPAT_W32PTHREADS_H
+#define 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
@@ -415,4 +415,4 @@ static av_unused void w32thread_init(void)
}
-#endif /* FFMPEG_COMPAT_W32PTHREADS_H */
+#endif /* COMPAT_W32PTHREADS_H */