libcamera: Standardise on C compatibility headers

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>

include/libcamera/timer.h

@@ -8,7 +8,7 @@
 #define __LIBCAMERA_TIMER_H__
 
 #include <chrono>
-#include <cstdint>
+#include <stdint.h>
 
 #include <libcamera/object.h>
 #include <libcamera/signal.h>

src/cam/capture.cpp

@@ -6,9 +6,9 @@
  */
 
 #include <chrono>
-#include <climits>
 #include <iomanip>
 #include <iostream>
+#include <limits.h>
 #include <sstream>
 
 #include "capture.h"

src/cam/options.cpp

@@ -5,7 +5,7 @@
  * options.cpp - cam - Options parsing
  */
 
-#include <cassert>
+#include <assert.h>
 #include <getopt.h>
 #include <iomanip>
 #include <iostream>

src/ipa/rkisp1/rkisp1.cpp

@@ -6,9 +6,9 @@
  */
 
 #include <algorithm>
-#include <cstdint>
 #include <math.h>
 #include <queue>
+#include <stdint.h>
 #include <string.h>
 
 #include <linux/rkisp1-config.h>

src/libcamera/device_enumerator_udev.cpp

@@ -8,11 +8,10 @@
 #include "device_enumerator_udev.h"
 
 #include <algorithm>
-#include <list>
-#include <map>
-
 #include <fcntl.h>
 #include <libudev.h>
+#include <list>
+#include <map>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/sysmacros.h>

src/libcamera/include/event_dispatcher_poll.h

@@ -7,12 +7,12 @@
 #ifndef __LIBCAMERA_EVENT_DISPATCHER_POLL_H__
 #define __LIBCAMERA_EVENT_DISPATCHER_POLL_H__
 
-#include <libcamera/event_dispatcher.h>
-
 #include <list>
 #include <map>
 #include <vector>
 
+#include <libcamera/event_dispatcher.h>
+
 struct pollfd;
 
 namespace libcamera {

src/libcamera/include/ipc_unixsocket.h

@@ -8,7 +8,7 @@
 #ifndef __LIBCAMERA_IPC_UNIXSOCKET_H__
 #define __LIBCAMERA_IPC_UNIXSOCKET_H__
 
-#include <cstdint>
+#include <stdint.h>
 #include <sys/types.h>
 #include <vector>
 

src/libcamera/log.cpp

@@ -7,14 +7,14 @@
 
 #include "log.h"
 
-#include <cstdio>
-#include <cstdlib>
-#include <ctime>
 #include <fstream>
 #include <iostream>
 #include <list>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
+#include <time.h>
 #include <unordered_set>
 
 #include <libcamera/logging.h>

src/libcamera/media_device.cpp

@@ -9,11 +9,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <string>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-
-#include <string>
 #include <vector>
 
 #include <linux/media.h>

src/libcamera/media_object.cpp

@@ -8,10 +8,9 @@
 #include "media_object.h"
 
 #include <errno.h>
+#include <string>
 #include <string.h>
 #include <unistd.h>
-
-#include <string>
 #include <vector>
 
 #include <linux/media.h>

src/libcamera/stream.cpp

@@ -9,8 +9,8 @@
 
 #include <algorithm>
 #include <array>
-#include <climits>
 #include <iomanip>
+#include <limits.h>
 #include <sstream>
 
 #include <libcamera/request.h>

test/ipa/ipa_interface_test.cpp

@@ -6,13 +6,12 @@
  */
 
 #include <fcntl.h>
+#include <iostream>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <iostream>
-
 #include <libcamera/event_dispatcher.h>
 #include <libcamera/event_notifier.h>
 #include <libcamera/timer.h>

test/media_device/media_device_print_test.cpp

@@ -4,8 +4,8 @@
  *
  * media_device_print_test.cpp - Print out media devices
  */
-#include <iostream>
 
+#include <iostream>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

test/pipeline/ipu3/ipu3_pipeline_test.cpp

@@ -6,7 +6,6 @@
  */
 
 #include <iostream>
-
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>

test/v4l2_subdevice/test_formats.cpp

@@ -5,8 +5,8 @@
  * libcamera V4L2 Subdevice format handling test
  */
 
-#include <climits>
 #include <iostream>
+#include <limits.h>
 
 #include "v4l2_subdevice.h"
 #include "v4l2_subdevice_test.h"

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"
 

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"
 

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"