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>
This commit is contained in:
Laurent Pinchart
2019-10-23 17:39:39 +03:00
parent bb5f8cf495
commit ca260d2f53
18 changed files with 22 additions and 27 deletions
+1 -1
View File
@@ -6,9 +6,9 @@
*/
#include <chrono>
#include <climits>
#include <iomanip>
#include <iostream>
#include <limits.h>
#include <sstream>
#include "capture.h"
+1 -1
View File
@@ -5,7 +5,7 @@
* options.cpp - cam - Options parsing
*/
#include <cassert>
#include <assert.h>
#include <getopt.h>
#include <iomanip>
#include <iostream>
+1 -1
View File
@@ -6,9 +6,9 @@
*/
#include <algorithm>
#include <cstdint>
#include <math.h>
#include <queue>
#include <stdint.h>
#include <string.h>
#include <linux/rkisp1-config.h>
+2 -3
View File
@@ -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>
@@ -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 {
+1 -1
View File
@@ -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>
+3 -3
View File
@@ -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>
+1 -2
View File
@@ -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>
+1 -2
View File
@@ -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>
+1 -1
View File
@@ -9,8 +9,8 @@
#include <algorithm>
#include <array>
#include <climits>
#include <iomanip>
#include <limits.h>
#include <sstream>
#include <libcamera/request.h>