From 5585ebcacbfe9f54a367f4070b0dceeaa5fa09b2 Mon Sep 17 00:00:00 2001
From: chrfranke <chrfranke@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Sat, 4 Aug 2018 19:09:46 +0000
Subject: [PATCH] Remove int64.h, use <inttypes.h> or <stdint.h> instead.
git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@4746 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
smartmontools/ChangeLog | 2 ++
smartmontools/Makefile.am | 2 --
smartmontools/atacmds.cpp | 8 +++--
smartmontools/ataidentify.cpp | 6 ++--
smartmontools/ataprint.cpp | 3 +-
smartmontools/cciss.cpp | 1 -
smartmontools/dev_areca.cpp | 1 -
smartmontools/dev_ata_cmd_set.cpp | 4 +--
smartmontools/dev_intelliprop.cpp | 2 +-
smartmontools/dev_interface.cpp | 2 +-
smartmontools/dev_legacy.cpp | 4 +--
smartmontools/int64.h | 32 -------------------
smartmontools/knowndrives.cpp | 4 +--
smartmontools/nvmecmds.h | 4 +--
smartmontools/nvmeprint.cpp | 5 ++-
smartmontools/os_darwin.cpp | 2 +-
smartmontools/os_freebsd.cpp | 2 +-
smartmontools/os_generic.cpp | 3 +-
smartmontools/os_linux.cpp | 1 -
smartmontools/os_netbsd.cpp | 2 +-
smartmontools/os_openbsd.cpp | 2 +-
smartmontools/os_os2.cpp | 1 -
smartmontools/os_qnxnto.cpp | 1 -
smartmontools/os_solaris.cpp | 2 +-
smartmontools/os_win32.cpp | 1 -
smartmontools/os_win32/vc14/smartctl.vcxproj | 1 -
.../os_win32/vc14/smartctl.vcxproj.filters | 1 -
smartmontools/os_win32/vc14/smartd.vcxproj | 1 -
.../os_win32/vc14/smartd.vcxproj.filters | 1 -
smartmontools/scsiata.cpp | 2 +-
smartmontools/scsicmds.cpp | 2 +-
smartmontools/scsiprint.cpp | 6 ++--
smartmontools/smartctl.cpp | 9 +++---
smartmontools/smartd.cpp | 3 +-
smartmontools/utility.cpp | 5 +--
smartmontools/utility.h | 1 +
36 files changed, 50 insertions(+), 79 deletions(-)
delete mode 100644 smartmontools/int64.h
diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog
index c7163f4a5..0570b6f30 100644
--- a/smartmontools/ChangeLog
+++ b/smartmontools/ChangeLog
@@ -2,6 +2,8 @@ $Id$
2018-08-04 Christian Franke <franke@computer.org>
+ Remove int64.h, use <inttypes.h> or <stdint.h> instead.
+
configure.ac, utility.cpp, utility.h: Add 128-bit unsigned integer
to string conversion. Provides full integer precision if compiler
supports '__int128' (e.g. x86_64 GCC and CLang).
diff --git a/smartmontools/Makefile.am b/smartmontools/Makefile.am
index a0c54f4bb..28a304dc6 100644
--- a/smartmontools/Makefile.am
+++ b/smartmontools/Makefile.am
@@ -69,7 +69,6 @@ smartctl_SOURCES = \
dev_interface.h \
dev_tunnelled.h \
drivedb.h \
- int64.h \
json.cpp \
json.h \
knowndrives.cpp \
@@ -142,7 +141,6 @@ smartd_SOURCES = \
dev_interface.h \
dev_tunnelled.h \
drivedb.h \
- int64.h \
knowndrives.cpp \
knowndrives.h \
nvmecmds.cpp \
diff --git a/smartmontools/atacmds.cpp b/smartmontools/atacmds.cpp
index b2e3a3d1e..b85fb309c 100644
--- a/smartmontools/atacmds.cpp
+++ b/smartmontools/atacmds.cpp
@@ -4,7 +4,7 @@
* Home page of code is: http://www.smartmontools.org
*
* Copyright (C) 2002-11 Bruce Allen
- * Copyright (C) 2008-17 Christian Franke
+ * Copyright (C) 2008-18 Christian Franke
* Copyright (C) 1999-2000 Michael Cornwell <cornwell@acm.org>
* Copyright (C) 2000 Andre Hedrick <andre@linux-ide.org>
*
@@ -23,14 +23,16 @@
*
*/
+#include "config.h"
+#define __STDC_FORMAT_MACROS 1 // enable PRI* for C++
+
+#include <inttypes.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <ctype.h>
-#include "config.h"
-#include "int64.h"
#include "atacmds.h"
#include "knowndrives.h" // get_default_attr_defs()
#include "utility.h"
diff --git a/smartmontools/ataidentify.cpp b/smartmontools/ataidentify.cpp
index cd7e281e3..bd94a89c6 100644
--- a/smartmontools/ataidentify.cpp
+++ b/smartmontools/ataidentify.cpp
@@ -3,7 +3,7 @@
*
* Home page of code is: http://www.smartmontools.org
*
- * Copyright (C) 2012-17 Christian Franke
+ * Copyright (C) 2012-18 Christian Franke
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,14 +16,16 @@
*/
#include "config.h"
+#define __STDC_FORMAT_MACROS 1 // enable PRI* for C++
+
#include "ataidentify.h"
const char * ataidentify_cpp_cvsid = "$Id$"
ATAIDENTIFY_H_CVSID;
-#include "int64.h"
#include "utility.h"
+#include <inttypes.h>
// Table 12 of X3T10/0948D (ATA-2) Revision 4c, March 18, 1996
// Table 9 of X3T13/2008D (ATA-3) Revision 7b, January 27, 1997
diff --git a/smartmontools/ataprint.cpp b/smartmontools/ataprint.cpp
index f0eee82e2..8a11c29c7 100644
--- a/smartmontools/ataprint.cpp
+++ b/smartmontools/ataprint.cpp
@@ -23,14 +23,15 @@
*/
#include "config.h"
+#define __STDC_FORMAT_MACROS 1 // enable PRI* for C++
#include <ctype.h>
#include <errno.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "int64.h"
#include "atacmdnames.h"
#include "atacmds.h"
#include "ataidentify.h"
diff --git a/smartmontools/cciss.cpp b/smartmontools/cciss.cpp
index 996a04edb..ce415af1a 100644
--- a/smartmontools/cciss.cpp
+++ b/smartmontools/cciss.cpp
@@ -34,7 +34,6 @@
#ifdef _HAVE_CCISS
#include "cciss.h"
-#include "int64.h"
#include "scsicmds.h"
#include "utility.h"
diff --git a/smartmontools/dev_areca.cpp b/smartmontools/dev_areca.cpp
index 545c19413..aa5fbdc39 100644
--- a/smartmontools/dev_areca.cpp
+++ b/smartmontools/dev_areca.cpp
@@ -16,7 +16,6 @@
*/
#include "config.h"
-#include "int64.h"
#include "dev_interface.h"
#include "dev_areca.h"
diff --git a/smartmontools/dev_ata_cmd_set.cpp b/smartmontools/dev_ata_cmd_set.cpp
index 6c2f6d708..f92e4db3d 100644
--- a/smartmontools/dev_ata_cmd_set.cpp
+++ b/smartmontools/dev_ata_cmd_set.cpp
@@ -3,7 +3,7 @@
*
* Home page of code is: http://www.smartmontools.org
*
- * Copyright (C) 2008 Christian Franke
+ * Copyright (C) 2008-18 Christian Franke
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
*/
#include "config.h"
-#include "int64.h"
+
#include "atacmds.h"
#include "dev_ata_cmd_set.h"
diff --git a/smartmontools/dev_intelliprop.cpp b/smartmontools/dev_intelliprop.cpp
index ffc8fc54a..aaf83315c 100644
--- a/smartmontools/dev_intelliprop.cpp
+++ b/smartmontools/dev_intelliprop.cpp
@@ -16,7 +16,7 @@
*/
#include "config.h"
-#include "int64.h"
+
#include "atacmds.h" //ATTR_PACKED and ASSERT_SIZEOF_STRUCT
#include "dev_interface.h"
#include "dev_intelliprop.h"
diff --git a/smartmontools/dev_interface.cpp b/smartmontools/dev_interface.cpp
index 791e21138..1224ffb5e 100644
--- a/smartmontools/dev_interface.cpp
+++ b/smartmontools/dev_interface.cpp
@@ -16,7 +16,7 @@
*/
#include "config.h"
-#include "int64.h"
+
#include "dev_interface.h"
#include "dev_intelliprop.h"
#include "dev_tunnelled.h"
diff --git a/smartmontools/dev_legacy.cpp b/smartmontools/dev_legacy.cpp
index a6e25c8c8..9dc418c15 100644
--- a/smartmontools/dev_legacy.cpp
+++ b/smartmontools/dev_legacy.cpp
@@ -3,7 +3,7 @@
*
* Home page of code is: http://www.smartmontools.org
*
- * Copyright (C) 2008-16 Christian Franke
+ * Copyright (C) 2008-18 Christian Franke
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
*/
#include "config.h"
-#include "int64.h"
+
#include "utility.h"
#include "atacmds.h"
#include "scsicmds.h"
diff --git a/smartmontools/int64.h b/smartmontools/int64.h
deleted file mode 100644
index 09840a60d..000000000
--- a/smartmontools/int64.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * int64.h
- *
- * Home page of code is: http://www.smartmontools.org
- *
- * Copyright (C) 2002-11 Bruce Allen
- * Copyright (C) 2004-18 Christian Franke
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * You should have received a copy of the GNU General Public License
- * (for example COPYING); if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#ifndef INT64_H_
-#define INT64_H_
-
-#define INT64_H_CVSID "$Id$"
-
-// TODO: Remove this file, use <inttypes.h> or <stdint.h> instead.
-
-// The ISO C99 standard specifies that in C++ implementations the PRI* macros
-// from <inttypes.h> should only be defined if explicitly requested
-#define __STDC_FORMAT_MACROS 1
-#include <inttypes.h> // PRId64, PRIu64, PRIx64 (also includes <stdint.h>)
-
-#endif // INT64_H
diff --git a/smartmontools/knowndrives.cpp b/smartmontools/knowndrives.cpp
index 12b182fda..7eaa7fc13 100644
--- a/smartmontools/knowndrives.cpp
+++ b/smartmontools/knowndrives.cpp
@@ -4,7 +4,7 @@
* Home page of code is: http://www.smartmontools.org
*
* Copyright (C) 2003-11 Philip Williams, Bruce Allen
- * Copyright (C) 2008-16 Christian Franke
+ * Copyright (C) 2008-18 Christian Franke
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
*/
#include "config.h"
-#include "int64.h"
+
#include <stdio.h>
#include "atacmds.h"
#include "knowndrives.h"
diff --git a/smartmontools/nvmecmds.h b/smartmontools/nvmecmds.h
index 348e5fb0f..a8dd4172d 100644
--- a/smartmontools/nvmecmds.h
+++ b/smartmontools/nvmecmds.h
@@ -3,7 +3,7 @@
*
* Home page of code is: http://www.smartmontools.org
*
- * Copyright (C) 2016 Christian Franke
+ * Copyright (C) 2016-18 Christian Franke
*
* Original code from <linux/nvme.h>:
* Copyright (C) 2011-2014 Intel Corporation
@@ -23,7 +23,7 @@
#define NVMECMDS_H_CVSID "$Id$"
-#include "int64.h"
+#include <stdint.h>
// The code below was orginally imported from <linux/nvme.h> include file from
// Linux kernel sources. Types from <linux/types.h> were replaced.
diff --git a/smartmontools/nvmeprint.cpp b/smartmontools/nvmeprint.cpp
index d5910f5dd..d85bfd9f9 100644
--- a/smartmontools/nvmeprint.cpp
+++ b/smartmontools/nvmeprint.cpp
@@ -16,12 +16,13 @@
*/
#include "config.h"
+#define __STDC_FORMAT_MACROS 1 // enable PRI* for C++
+
#include "nvmeprint.h"
const char * nvmeprint_cvsid = "$Id$"
NVMEPRINT_H_CVSID;
-#include "int64.h"
#include "utility.h"
#include "dev_interface.h"
#include "nvmecmds.h"
@@ -30,6 +31,8 @@ const char * nvmeprint_cvsid = "$Id$"
#include "smartctl.h"
#include "sg_unaligned.h"
+#include <inttypes.h>
+
using namespace smartmontools;
// Return true if 128 bit LE integer is != 0.
diff --git a/smartmontools/os_darwin.cpp b/smartmontools/os_darwin.cpp
index e7d40837c..a4a1c6b73 100644
--- a/smartmontools/os_darwin.cpp
+++ b/smartmontools/os_darwin.cpp
@@ -35,7 +35,7 @@
#include <CoreFoundation/CoreFoundation.h>
#include "config.h"
-#include "int64.h"
+
#include "atacmds.h"
#include "scsicmds.h"
#include "nvmecmds.h"
diff --git a/smartmontools/os_freebsd.cpp b/smartmontools/os_freebsd.cpp
index 5cfae66bb..a6c9b90cf 100644
--- a/smartmontools/os_freebsd.cpp
+++ b/smartmontools/os_freebsd.cpp
@@ -38,7 +38,7 @@
#include <sys/utsname.h>
#include "config.h"
-#include "int64.h"
+
// set by /usr/include/sys/ata.h, suppress warning
#undef ATA_READ_LOG_EXT
#include "atacmds.h"
diff --git a/smartmontools/os_generic.cpp b/smartmontools/os_generic.cpp
index 1546edcbd..6cbb0334d 100644
--- a/smartmontools/os_generic.cpp
+++ b/smartmontools/os_generic.cpp
@@ -5,7 +5,7 @@
*
* Copyright (C) YEAR YOUR_NAME
* Copyright (C) 2003-8 Bruce Allen
- * Copyright (C) 2008 Christian Franke
+ * Copyright (C) 2008-18 Christian Franke
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -71,7 +71,6 @@
// These are needed to define prototypes and structures for the
// functions defined below
-#include "int64.h"
#include "atacmds.h"
#include "utility.h"
diff --git a/smartmontools/os_linux.cpp b/smartmontools/os_linux.cpp
index e305a3728..219351efb 100644
--- a/smartmontools/os_linux.cpp
+++ b/smartmontools/os_linux.cpp
@@ -84,7 +84,6 @@
#include <selinux/selinux.h>
#endif
-#include "int64.h"
#include "atacmds.h"
#include "os_linux.h"
#include "scsicmds.h"
diff --git a/smartmontools/os_netbsd.cpp b/smartmontools/os_netbsd.cpp
index 7f06d9c7f..65ff23cb9 100644
--- a/smartmontools/os_netbsd.cpp
+++ b/smartmontools/os_netbsd.cpp
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "int64.h"
+
#include "atacmds.h"
#include "scsicmds.h"
#include "utility.h"
diff --git a/smartmontools/os_openbsd.cpp b/smartmontools/os_openbsd.cpp
index d3fed8442..97ee2a410 100644
--- a/smartmontools/os_openbsd.cpp
+++ b/smartmontools/os_openbsd.cpp
@@ -19,7 +19,7 @@
*/
#include "config.h"
-#include "int64.h"
+
#include "atacmds.h"
#include "scsicmds.h"
#include "utility.h"
diff --git a/smartmontools/os_os2.cpp b/smartmontools/os_os2.cpp
index 65860efb0..858926563 100644
--- a/smartmontools/os_os2.cpp
+++ b/smartmontools/os_os2.cpp
@@ -23,7 +23,6 @@
// These are needed to define prototypes for the functions defined below
#include "config.h"
-#include "int64.h"
#include <ctype.h>
#include <errno.h>
diff --git a/smartmontools/os_qnxnto.cpp b/smartmontools/os_qnxnto.cpp
index 44bf5c37b..95678e3c1 100644
--- a/smartmontools/os_qnxnto.cpp
+++ b/smartmontools/os_qnxnto.cpp
@@ -5,7 +5,6 @@
// These are needed to define prototypes and structures for the
// functions defined below
-#include "int64.h"
#include "atacmds.h"
#include "scsicmds.h"
#include "utility.h"
diff --git a/smartmontools/os_solaris.cpp b/smartmontools/os_solaris.cpp
index fef639721..31029bdae 100644
--- a/smartmontools/os_solaris.cpp
+++ b/smartmontools/os_solaris.cpp
@@ -27,7 +27,7 @@
// These are needed to define prototypes for the functions defined below
#include "config.h"
-#include "int64.h"
+
#include "atacmds.h"
#include "scsicmds.h"
#include "utility.h"
diff --git a/smartmontools/os_win32.cpp b/smartmontools/os_win32.cpp
index de70b78c4..7b3196c55 100644
--- a/smartmontools/os_win32.cpp
+++ b/smartmontools/os_win32.cpp
@@ -25,7 +25,6 @@
#define WINVER 0x0502
#define _WIN32_WINNT WINVER
-#include "int64.h"
#include "atacmds.h"
#include "scsicmds.h"
#include "nvmecmds.h"
diff --git a/smartmontools/os_win32/vc14/smartctl.vcxproj b/smartmontools/os_win32/vc14/smartctl.vcxproj
index 767a51415..b90194316 100644
--- a/smartmontools/os_win32/vc14/smartctl.vcxproj
+++ b/smartmontools/os_win32/vc14/smartctl.vcxproj
@@ -326,7 +326,6 @@
<ClInclude Include="..\..\dev_interface.h" />
<ClInclude Include="..\..\dev_tunnelled.h" />
<ClInclude Include="..\..\drivedb.h" />
- <ClInclude Include="..\..\int64.h" />
<ClInclude Include="..\..\knowndrives.h" />
<CustomBuildStep Include="..\..\megaraid.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
diff --git a/smartmontools/os_win32/vc14/smartctl.vcxproj.filters b/smartmontools/os_win32/vc14/smartctl.vcxproj.filters
index a790ae63b..cc4b1a4c3 100644
--- a/smartmontools/os_win32/vc14/smartctl.vcxproj.filters
+++ b/smartmontools/os_win32/vc14/smartctl.vcxproj.filters
@@ -96,7 +96,6 @@
<ClInclude Include="..\..\dev_interface.h" />
<ClInclude Include="..\..\dev_tunnelled.h" />
<ClInclude Include="..\..\drivedb.h" />
- <ClInclude Include="..\..\int64.h" />
<ClInclude Include="..\..\knowndrives.h" />
<ClInclude Include="..\..\scsicmds.h" />
<ClInclude Include="..\..\scsiprint.h" />
diff --git a/smartmontools/os_win32/vc14/smartd.vcxproj b/smartmontools/os_win32/vc14/smartd.vcxproj
index e68a50b74..3210f4c67 100644
--- a/smartmontools/os_win32/vc14/smartd.vcxproj
+++ b/smartmontools/os_win32/vc14/smartd.vcxproj
@@ -339,7 +339,6 @@
<ClInclude Include="..\..\dev_interface.h" />
<ClInclude Include="..\..\dev_tunnelled.h" />
<ClInclude Include="..\..\drivedb.h" />
- <ClInclude Include="..\..\int64.h" />
<ClInclude Include="..\..\knowndrives.h" />
<CustomBuildStep Include="..\..\megaraid.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
diff --git a/smartmontools/os_win32/vc14/smartd.vcxproj.filters b/smartmontools/os_win32/vc14/smartd.vcxproj.filters
index 8dbe158ed..bca6b0d1e 100644
--- a/smartmontools/os_win32/vc14/smartd.vcxproj.filters
+++ b/smartmontools/os_win32/vc14/smartd.vcxproj.filters
@@ -100,7 +100,6 @@
<ClInclude Include="..\..\dev_interface.h" />
<ClInclude Include="..\..\dev_tunnelled.h" />
<ClInclude Include="..\..\drivedb.h" />
- <ClInclude Include="..\..\int64.h" />
<ClInclude Include="..\..\knowndrives.h" />
<ClInclude Include="..\..\scsicmds.h" />
<ClInclude Include="..\..\utility.h" />
diff --git a/smartmontools/scsiata.cpp b/smartmontools/scsiata.cpp
index d21af7d9b..f4afda90c 100644
--- a/smartmontools/scsiata.cpp
+++ b/smartmontools/scsiata.cpp
@@ -53,7 +53,7 @@
#include <errno.h>
#include "config.h"
-#include "int64.h"
+
#include "scsicmds.h"
#include "atacmds.h" // ataReadHDIdentity()
#include "knowndrives.h" // lookup_usb_device()
diff --git a/smartmontools/scsicmds.cpp b/smartmontools/scsicmds.cpp
index aea540ac9..c0a097d2f 100644
--- a/smartmontools/scsicmds.cpp
+++ b/smartmontools/scsicmds.cpp
@@ -41,7 +41,7 @@
#include <ctype.h>
#include "config.h"
-#include "int64.h"
+
#include "scsicmds.h"
#include "atacmds.h" // FIXME: for smart_command_set only
#include "dev_interface.h"
diff --git a/smartmontools/scsiprint.cpp b/smartmontools/scsiprint.cpp
index d4972f249..2f3cc8186 100644
--- a/smartmontools/scsiprint.cpp
+++ b/smartmontools/scsiprint.cpp
@@ -24,13 +24,15 @@
*/
+#include "config.h"
+#define __STDC_FORMAT_MACROS 1 // enable PRI* for C++
+
+#include <inttypes.h>
#include <stdio.h>
#include <string.h>
#include <fcntl.h>
#include <errno.h>
-#include "config.h"
-#include "int64.h"
#include "scsicmds.h"
#include "atacmds.h" // smart_command_set
#include "dev_interface.h"
diff --git a/smartmontools/smartctl.cpp b/smartmontools/smartctl.cpp
index d130dd4c8..3747ed779 100644
--- a/smartmontools/smartctl.cpp
+++ b/smartmontools/smartctl.cpp
@@ -4,7 +4,7 @@
* Home page of code is: http://www.smartmontools.org
*
* Copyright (C) 2002-11 Bruce Allen
- * Copyright (C) 2008-17 Christian Franke
+ * Copyright (C) 2008-18 Christian Franke
* Copyright (C) 2000 Michael Cornwell <cornwell@acm.org>
*
* This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,11 @@
*
*/
+#include "config.h"
+#define __STDC_FORMAT_MACROS 1 // enable PRI* for C++
+
#include <errno.h>
+#include <inttypes.h>
#include <stdio.h>
#include <sys/types.h>
#include <string.h>
@@ -31,8 +35,6 @@
#include <stdexcept>
#include <getopt.h>
-#include "config.h"
-
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -41,7 +43,6 @@
#include <sys/param.h>
#endif
-#include "int64.h"
#include "atacmds.h"
#include "dev_interface.h"
#include "ataprint.h"
diff --git a/smartmontools/smartd.cpp b/smartmontools/smartd.cpp
index df2746a4e..cd190d9b0 100644
--- a/smartmontools/smartd.cpp
+++ b/smartmontools/smartd.cpp
@@ -22,9 +22,10 @@
*/
#include "config.h"
-#include "int64.h"
+#define __STDC_FORMAT_MACROS 1 // enable PRI* for C++
// unconditionally included files
+#include <inttypes.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h> // umask
diff --git a/smartmontools/utility.cpp b/smartmontools/utility.cpp
index 2d1de622f..4ce9cbc3d 100644
--- a/smartmontools/utility.cpp
+++ b/smartmontools/utility.cpp
@@ -27,7 +27,9 @@
// SMARTCTL, OR BOTH.
#include "config.h"
+#define __STDC_FORMAT_MACROS 1 // enable PRI* for C++
+#include <inttypes.h>
#include <stdio.h>
#include <string.h>
#include <time.h>
@@ -46,7 +48,6 @@
#include <stdexcept>
#include "svnversion.h"
-#include "int64.h"
#include "utility.h"
#include "atacmds.h"
@@ -54,7 +55,7 @@
#include "sg_unaligned.h"
const char * utility_cpp_cvsid = "$Id$"
- UTILITY_H_CVSID INT64_H_CVSID;
+ UTILITY_H_CVSID;
const char * packet_types[] = {
"Direct-access (disk)",
diff --git a/smartmontools/utility.h b/smartmontools/utility.h
index fc7d02a11..7e3f99150 100644
--- a/smartmontools/utility.h
+++ b/smartmontools/utility.h
@@ -32,6 +32,7 @@
#include <sys/types.h> // for regex.h (according to POSIX)
#include <regex.h>
#include <stdarg.h>
+#include <stdint.h>
#include <stdio.h>
#include <string.h>
#include <string>
--
GitLab