Switch to C++ versions of standard C headers

src/util/dos_assert.h

@@ -33,8 +33,8 @@
 #ifndef DOS_ASSERT_HPP
 #define DOS_ASSERT_HPP
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "src/crypto/crypto.h"
 

src/util/fatal_assert.h

@@ -33,8 +33,8 @@
 #ifndef FATAL_ASSERT_HPP
 #define FATAL_ASSERT_HPP
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 static void fatal_error( const char *expression, const char *file, int line, const char *function )
 {

src/util/locale_utils.cc

@@ -32,11 +32,11 @@
 
 #include "src/include/config.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <locale.h>
-#include <errno.h>
+#include <cerrno>
+#include <clocale>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <string>
 
 #if HAVE_LANGINFO_H

src/util/pty_compat.cc

@@ -33,14 +33,15 @@
 #include "src/include/config.h"
 
 #if !defined(HAVE_FORKPTY) || !defined(HAVE_CFMAKERAW)
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/stropts.h>
 #include <termios.h>
+#include <unistd.h>
 
 #include "src/util/pty_compat.h"
 

src/util/select.h

@@ -33,11 +33,12 @@
 #ifndef SELECT_HPP
 #define SELECT_HPP
 
-#include <string.h>
-#include <errno.h>
-#include <signal.h>
+#include <cassert>
+#include <cerrno>
+#include <csignal>
+#include <cstring>
+
 #include <sys/select.h>
-#include <assert.h>
 
 #include "src/util/fatal_assert.h"
 #include "src/util/timestamp.h"

src/util/swrite.cc

@@ -30,9 +30,10 @@
     also delete it here.
 */
 
+#include <cstdio>
+#include <cstring>
+
 #include <unistd.h>
-#include <string.h>
-#include <stdio.h>
 
 #include "src/util/swrite.h"
 

src/util/timestamp.cc

@@ -34,10 +34,10 @@
 
 #include "src/util/timestamp.h"
 
-#include <errno.h>
+#include <cerrno>
 
 #if HAVE_CLOCK_GETTIME
-#include <time.h>
+#include <ctime>
 #endif
 #if HAVE_MACH_ABSOLUTE_TIME
 #include <mach/error.h>
@@ -45,7 +45,7 @@
 #endif
 #if HAVE_GETTIMEOFDAY
 #include <sys/time.h>
-#include <stdio.h>
+#include <cstdio>
 #endif
 
 // On Apple systems CLOCK_MONOTONIC is unfortunately able to go

src/util/timestamp.h

@@ -33,7 +33,7 @@
 #ifndef TIMESTAMP_HPP
 #define TIMESTAMP_HPP
 
-#include <stdint.h>
+#include <cstdint>
 
 void freeze_timestamp( void );
 uint64_t frozen_timestamp( void );