From ca260d2f5337536e30d1b2501434bd2a93a3e72e Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Wed, 23 Oct 2019 14:31:13 +0300
Subject: libcamera: Standardise on C compatibility headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Now that our usage of C compatibility header is documented, use them
consistently through the source code.

While at it, group the C and C++ include statements as defined in the
coding style, and fix a handful of #include ordering issues.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 test/v4l2_videodevice/capture_async.cpp | 4 ++--
 test/v4l2_videodevice/controls.cpp      | 2 +-
 test/v4l2_videodevice/formats.cpp       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/v4l2_videodevice')

diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp
index 17eb528b..442a4fe5 100644
--- a/test/v4l2_videodevice/capture_async.cpp
+++ b/test/v4l2_videodevice/capture_async.cpp
@@ -5,12 +5,12 @@
  * libcamera V4L2 API tests
  */
 
+#include <iostream>
+
 #include <libcamera/buffer.h>
 #include <libcamera/event_dispatcher.h>
 #include <libcamera/timer.h>
 
-#include <iostream>
-
 #include "thread.h"
 #include "v4l2_videodevice_test.h"
 
diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp
index 975c852b..42c653d4 100644
--- a/test/v4l2_videodevice/controls.cpp
+++ b/test/v4l2_videodevice/controls.cpp
@@ -5,8 +5,8 @@
  * controls.cpp - V4L2 device controls handling test
  */
 
-#include <climits>
 #include <iostream>
+#include <limits.h>
 
 #include "v4l2_videodevice.h"
 
diff --git a/test/v4l2_videodevice/formats.cpp b/test/v4l2_videodevice/formats.cpp
index ee7d357d..d504d178 100644
--- a/test/v4l2_videodevice/formats.cpp
+++ b/test/v4l2_videodevice/formats.cpp
@@ -5,8 +5,8 @@
  * libcamera V4L2 device format handling test
  */
 
-#include <climits>
 #include <iostream>
+#include <limits.h>
 
 #include "v4l2_videodevice.h"
 
-- 
cgit v1.2.1