ffmpeg | branch: master | Clément Bœsch <cboe...@gopro.com> | Thu Sep 7 15:52:47 2017 +0200| [e0b9b3e60ea3b970c5fcdbccb401cd9d93b9a63f] | committer: Clément Bœsch
lavu/tests: move timer.h include earlier In the next commit, timer.h will require a _GNU_SOURCE to be set before including system headers. This commit prevents compilation failures. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0b9b3e60ea3b970c5fcdbccb401cd9d93b9a63f --- libavutil/tests/adler32.c | 4 +++- libavutil/tests/aes.c | 3 +++ libavutil/tests/base64.c | 4 +++- libavutil/tests/des.c | 2 ++ libavutil/tests/eval.c | 3 ++- libavutil/tests/softfloat.c | 2 ++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libavutil/tests/adler32.c b/libavutil/tests/adler32.c index 511bf1e401..13f760b477 100644 --- a/libavutil/tests/adler32.c +++ b/libavutil/tests/adler32.c @@ -17,10 +17,12 @@ */ // LCOV_EXCL_START + +#include "libavutil/timer.h" + #include <string.h> #include "libavutil/log.h" -#include "libavutil/timer.h" #include "libavutil/adler32.h" #define LEN 7001 diff --git a/libavutil/tests/aes.c b/libavutil/tests/aes.c index 1291ad6633..c7f842c1c7 100644 --- a/libavutil/tests/aes.c +++ b/libavutil/tests/aes.c @@ -17,6 +17,9 @@ */ // LCOV_EXCL_START + +#include "libavutil/timer.h" + #include <string.h> #include "libavutil/aes.h" diff --git a/libavutil/tests/base64.c b/libavutil/tests/base64.c index 88fd55c220..400e01cefe 100644 --- a/libavutil/tests/base64.c +++ b/libavutil/tests/base64.c @@ -17,12 +17,14 @@ */ // LCOV_EXCL_START + +#include "libavutil/timer.h" + #include <stdint.h> #include <stdio.h> #include "libavutil/common.h" #include "libavutil/base64.h" -#include "libavutil/timer.h" #define MAX_DATA_SIZE 1024 #define MAX_ENCODED_SIZE 2048 diff --git a/libavutil/tests/des.c b/libavutil/tests/des.c index eac33d47d4..f2a5c34f1a 100644 --- a/libavutil/tests/des.c +++ b/libavutil/tests/des.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/timer.h" + #include "libavutil/des.c" #include <stdint.h> diff --git a/libavutil/tests/eval.c b/libavutil/tests/eval.c index 2a1afcc4dc..b64c6d635d 100644 --- a/libavutil/tests/eval.c +++ b/libavutil/tests/eval.c @@ -16,12 +16,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/timer.h" + #include <math.h> #include <stdio.h> #include <string.h> #include "libavutil/libm.h" -#include "libavutil/timer.h" #include "libavutil/eval.h" static const double const_values[] = { diff --git a/libavutil/tests/softfloat.c b/libavutil/tests/softfloat.c index 16788d4da9..c06de44933 100644 --- a/libavutil/tests/softfloat.c +++ b/libavutil/tests/softfloat.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/timer.h" + #include <inttypes.h> #include "libavutil/softfloat.h" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
