Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'

* commit '93e65e9a6c0895f869752a66731d9b2ec3916467': Cosmetics, restore alphabetic order in atomics lists. Conflicts: libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · b2175b0f2a
parent 9ab221f8d8 93e65e9a6c
commit b2175b0f2a
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -1275,8 +1275,8 @@ THREADS_LIST='

 ATOMICS_LIST='
    atomics_gcc
-    atomics_win32
    atomics_suncc
+    atomics_win32
 '

 ARCH_LIST='
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@ -114,9 +114,9 @@ OBJS += $(COMPAT_OBJS:%=../compat/%)

 SKIPHEADERS          = old_pix_fmts.h

+SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
 SKIPHEADERS-$(HAVE_ATOMICS_SUNCC)      += atomic_suncc.h
 SKIPHEADERS-$(HAVE_ATOMICS_WIN32)      += atomic_win32.h
-SKIPHEADERS-$(HAVE_ATOMICS_GCC)        += atomic_gcc.h
 SKIPHEADERS-$(CONFIG_OPENCL)           += opencl.h

 TESTPROGS = adler32                                                     \