[FFmpeg-cvslog] compat/atomics: rename header guards

James Almer git at videolan.org
Sat Dec 3 01:13:49 EET 2016


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Dec  2 20:08:49 2016 -0300| [f88c8e0dc3a6afe6ca4c133f2d7182cdbb0b638d] | committer: James Almer

compat/atomics: rename header guards

Fixes fate-source.

Signed-off-by: James Almer <jamrial at gmail.com>

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

 compat/atomics/dummy/stdatomic.h   | 6 +++---
 compat/atomics/gcc/stdatomic.h     | 6 +++---
 compat/atomics/pthread/stdatomic.h | 6 +++---
 compat/atomics/suncc/stdatomic.h   | 6 +++---
 compat/atomics/win32/stdatomic.h   | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/compat/atomics/dummy/stdatomic.h b/compat/atomics/dummy/stdatomic.h
index 841c046..c26f629 100644
--- a/compat/atomics/dummy/stdatomic.h
+++ b/compat/atomics/dummy/stdatomic.h
@@ -21,8 +21,8 @@
  * Copyright (C) 2010 Rémi Denis-Courmont
  */
 
-#ifndef FFMPEG_COMPAT_ATOMICS_DUMMY_STDATOMIC_H
-#define FFMPEG_COMPAT_ATOMICS_DUMMY_STDATOMIC_H
+#ifndef COMPAT_ATOMICS_DUMMY_STDATOMIC_H
+#define COMPAT_ATOMICS_DUMMY_STDATOMIC_H
 
 #include <stdint.h>
 
@@ -173,4 +173,4 @@ FETCH_MODIFY(and, &)
 #define atomic_flag_clear_explicit(object, order) \
     atomic_flag_clear(object)
 
-#endif /* FFMPEG_COMPAT_ATOMICS_DUMMY_STDATOMIC_H */
+#endif /* COMPAT_ATOMICS_DUMMY_STDATOMIC_H */
diff --git a/compat/atomics/gcc/stdatomic.h b/compat/atomics/gcc/stdatomic.h
index 55cc4e4..41cadde 100644
--- a/compat/atomics/gcc/stdatomic.h
+++ b/compat/atomics/gcc/stdatomic.h
@@ -21,8 +21,8 @@
  * Copyright (C) 2010 Rémi Denis-Courmont
  */
 
-#ifndef FFMPEG_COMPAT_ATOMICS_GCC_STDATOMIC_H
-#define FFMPEG_COMPAT_ATOMICS_GCC_STDATOMIC_H
+#ifndef COMPAT_ATOMICS_GCC_STDATOMIC_H
+#define COMPAT_ATOMICS_GCC_STDATOMIC_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -170,4 +170,4 @@ do {                                    \
 #define atomic_flag_clear_explicit(object, order) \
     atomic_flag_clear(object)
 
-#endif /* FFMPEG_COMPAT_ATOMICS_GCC_STDATOMIC_H */
+#endif /* COMPAT_ATOMICS_GCC_STDATOMIC_H */
diff --git a/compat/atomics/pthread/stdatomic.h b/compat/atomics/pthread/stdatomic.h
index 60f9a9d..1b7278e 100644
--- a/compat/atomics/pthread/stdatomic.h
+++ b/compat/atomics/pthread/stdatomic.h
@@ -21,8 +21,8 @@
  * Copyright (C) 2010 Rémi Denis-Courmont
  */
 
-#ifndef FFMPEG_COMPAT_ATOMICS_PTHREAD_STDATOMIC_H
-#define FFMPEG_COMPAT_ATOMICS_PTHREAD_STDATOMIC_H
+#ifndef COMPAT_ATOMICS_PTHREAD_STDATOMIC_H
+#define COMPAT_ATOMICS_PTHREAD_STDATOMIC_H
 
 #include <stdint.h>
 
@@ -194,4 +194,4 @@ FETCH_MODIFY(and, &)
 #define atomic_flag_clear_explicit(object, order) \
     atomic_flag_clear(object)
 
-#endif /* FFMPEG_COMPAT_ATOMICS_PTHREAD_STDATOMIC_H */
+#endif /* COMPAT_ATOMICS_PTHREAD_STDATOMIC_H */
diff --git a/compat/atomics/suncc/stdatomic.h b/compat/atomics/suncc/stdatomic.h
index 43cd78d..119c2ba 100644
--- a/compat/atomics/suncc/stdatomic.h
+++ b/compat/atomics/suncc/stdatomic.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_COMPAT_ATOMICS_SUNCC_STDATOMIC_H
-#define FFMPEG_COMPAT_ATOMICS_SUNCC_STDATOMIC_H
+#ifndef COMPAT_ATOMICS_SUNCC_STDATOMIC_H
+#define COMPAT_ATOMICS_SUNCC_STDATOMIC_H
 
 #include <atomic.h>
 #include <mbarrier.h>
@@ -183,4 +183,4 @@ static inline intptr_t atomic_fetch_and(intptr_t *object, intptr_t operand)
 #define atomic_flag_clear_explicit(object, order) \
     atomic_flag_clear(object)
 
-#endif /* FFMPEG_COMPAT_ATOMICS_SUNCC_STDATOMIC_H */
+#endif /* COMPAT_ATOMICS_SUNCC_STDATOMIC_H */
diff --git a/compat/atomics/win32/stdatomic.h b/compat/atomics/win32/stdatomic.h
index 376da73..4cbba9c 100644
--- a/compat/atomics/win32/stdatomic.h
+++ b/compat/atomics/win32/stdatomic.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_COMPAT_ATOMICS_WIN32_STDATOMIC_H
-#define FFMPEG_COMPAT_ATOMICS_WIN32_STDATOMIC_H
+#ifndef COMPAT_ATOMICS_WIN32_STDATOMIC_H
+#define COMPAT_ATOMICS_WIN32_STDATOMIC_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -176,4 +176,4 @@ static inline int atomic_compare_exchange_strong(intptr_t *object, intptr_t *exp
 #define atomic_flag_clear_explicit(object, order) \
     atomic_flag_clear(object)
 
-#endif /* FFMPEG_COMPAT_ATOMICS_WIN32_STDATOMIC_H */
+#endif /* COMPAT_ATOMICS_WIN32_STDATOMIC_H */



More information about the ffmpeg-cvslog mailing list