Remove includes of <cinttypes>

Instead of including <cinttypes> directly, zm_define.h should be used
to get the typedef'ed types as well.
This commit is contained in:
Peter Keresztes Schmidt 2021-02-02 19:56:11 +01:00
parent 0f5df0c739
commit e09fa1bebf
8 changed files with 4 additions and 10 deletions

View File

@ -27,7 +27,6 @@
#include <getopt.h>
#include <arpa/inet.h>
#include <glob.h>
#include <cinttypes>
#include "zm.h"
#include "zm_db.h"
@ -692,8 +691,8 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
// The idea is to write out 1/sec
frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score));
double fps = monitor->get_capture_fps();
if ( write_to_db
or
if ( write_to_db
or
(frame_data.size() >= MAX_DB_FRAMES)
or
(frame_type == BULK)

View File

@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <cinttypes>
#include "zm_ffmpeg.h"
#include "zm_image.h"

View File

@ -1,7 +1,8 @@
#ifndef ZM_FONT_H
#define ZM_FONT_H
#include <inttypes.h>
#include "zm_define.h"
#include <string>
#define NUM_FONT_SIZES 4

View File

@ -21,7 +21,6 @@
#include <sys/stat.h>
#include <arpa/inet.h>
#include <glob.h>
#include <cinttypes>
#include "zm.h"
#include "zm_db.h"

View File

@ -26,7 +26,6 @@
#include <stdlib.h>
#include <string.h>
#include <cinttypes>
extern "C" {
#include "libavutil/time.h"

View File

@ -18,7 +18,6 @@
//
#define __STDC_FORMAT_MACROS 1
#include <cinttypes>
#include "zm.h"
#include "zm_db.h"
#include "zm_zone.h"

View File

@ -19,7 +19,6 @@
#include <sys/ipc.h>
#include <sys/msg.h>
#include <cinttypes>
#include <string>
#include "zm.h"

View File

@ -87,7 +87,6 @@ Options for use with monitors:
*/
#include <getopt.h>
#include <cinttypes>
#include "zm.h"
#include "zm_db.h"