From 55027291312b8990325ee7054279534fbbef974f Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 5 Dec 2020 16:18:15 -0500
Subject: [PATCH] Revert "[clang-tidy] Switch C headers to C++ ones"

This reverts commit 0344856d6510713cf4865380703e31bfd43fa712.
---
 src/CLI2.cpp      |  2 +-
 src/Context.cpp   |  8 ++++----
 src/DOM.cpp       |  2 +-
 src/Eval.cpp      |  2 +-
 src/Hooks.cpp     |  2 +-
 src/Lexer.cpp     |  2 +-
 src/TDB2.cpp      |  4 ++--
 src/TLSClient.cpp | 14 +++++++++-----
 src/Task.cpp      |  8 ++++----
 src/Variant.cpp   |  6 +++---
 src/calc.cpp      |  4 ++--
 src/feedback.cpp  |  4 ++--
 src/recur.cpp     | 10 +++++-----
 src/rules.cpp     |  2 +-
 src/sort.cpp      |  2 +-
 src/util.cpp      | 12 ++++++------
 16 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 3f8e3853c..aad608ef9 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -28,7 +28,7 @@
 #include <CLI2.h>
 #include <sstream>
 #include <algorithm>
-#include <cstdlib>
+#include <stdlib.h>
 #include <Context.h>
 #include <Lexer.h>
 #include <Color.h>
diff --git a/src/Context.cpp b/src/Context.cpp
index cc48c5ffd..988bc74e5 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -31,9 +31,9 @@
 #include <sstream>
 #include <iomanip>
 #include <algorithm>
-#include <cassert>
-#include <cstdlib>
-#include <cstring>
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <FS.h>
 #include <Eval.h>
@@ -48,7 +48,7 @@
 #include <commit.h>
 #endif
 
-#include <cstdio>
+#include <stdio.h>
 #include <sys/ioctl.h>
 
 #ifdef SOLARIS
diff --git a/src/DOM.cpp b/src/DOM.cpp
index ed1be1b4a..33573be8c 100644
--- a/src/DOM.cpp
+++ b/src/DOM.cpp
@@ -28,7 +28,7 @@
 #include <DOM.h>
 #include <sstream>
 #include <map>
-#include <cstdlib>
+#include <stdlib.h>
 #include <Variant.h>
 #include <Lexer.h>
 #include <Context.h>
diff --git a/src/Eval.cpp b/src/Eval.cpp
index d2b9bfeff..69aeeac21 100644
--- a/src/Eval.cpp
+++ b/src/Eval.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <Eval.h>
 #include <map>
-#include <ctime>
+#include <time.h>
 #include <Context.h>
 #include <Task.h>
 #include <Color.h>
diff --git a/src/Hooks.cpp b/src/Hooks.cpp
index 496104107..05eba2e14 100644
--- a/src/Hooks.cpp
+++ b/src/Hooks.cpp
@@ -32,7 +32,7 @@
 #ifdef FREEBSD
 #define _WITH_GETLINE
 #endif
-#include <cstdio>
+#include <stdio.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <sys/types.h>
diff --git a/src/Lexer.cpp b/src/Lexer.cpp
index 4b9349208..39e8866d6 100644
--- a/src/Lexer.cpp
+++ b/src/Lexer.cpp
@@ -27,7 +27,7 @@
 #include <cmake.h>
 #include <Lexer.h>
 #include <algorithm>
-#include <cctype>
+#include <ctype.h>
 #include <Datetime.h>
 #include <Duration.h>
 #include <unicode.h>
diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 004b30454..6d224189f 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -31,8 +31,8 @@
 #include <algorithm>
 #include <list>
 #include <set>
-#include <cstdlib>
-#include <csignal>
+#include <stdlib.h>
+#include <signal.h>
 #include <Context.h>
 #include <Color.h>
 #include <Datetime.h>
diff --git a/src/TLSClient.cpp b/src/TLSClient.cpp
index 993925691..4916e1e81 100644
--- a/src/TLSClient.cpp
+++ b/src/TLSClient.cpp
@@ -31,13 +31,17 @@
 #include <TLSClient.h>
 #include <iostream>
 #include <unistd.h>
-#include <cstdio>
-#include <cstdlib>
-#include <cstdint>
-#include <cstring>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include <cerrno>
+#if (defined OPENBSD || defined SOLARIS || defined NETBSD)
+#include <errno.h>
+#else
+#include <sys/errno.h>
+#endif
 #include <sys/types.h>
 #include <netdb.h>
 #include <gnutls/x509.h>
diff --git a/src/Task.cpp b/src/Task.cpp
index 922eac4ec..c93810582 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -27,12 +27,12 @@
 #include <cmake.h>
 #include <Task.h>
 #include <sstream>
-#include <cstdlib>
-#include <cassert>
+#include <stdlib.h>
+#include <assert.h>
 #include <string>
 #ifdef PRODUCT_TASKWARRIOR
-#include <cmath>
-#include <cctype>
+#include <math.h>
+#include <ctype.h>
 #endif
 #include <cfloat>
 #include <algorithm>
diff --git a/src/Variant.cpp b/src/Variant.cpp
index 3862aa58f..b755d7d04 100644
--- a/src/Variant.cpp
+++ b/src/Variant.cpp
@@ -28,9 +28,9 @@
 #include <sstream>
 #include <algorithm>
 #include <utility>
-#include <cstdio>
-#include <cmath>
-#include <cstdlib>
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
 #include <Variant.h>
 #include <Datetime.h>
 #include <Duration.h>
diff --git a/src/calc.cpp b/src/calc.cpp
index e4ef01229..27bc4dda6 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -27,8 +27,8 @@
 #include <cmake.h>
 #include <iostream>
 #include <string>
-#include <cstdlib>
-#include <cstring>
+#include <stdlib.h>
+#include <string.h>
 #include <Eval.h>
 #include <Context.h>
 #include <Task.h>
diff --git a/src/feedback.cpp b/src/feedback.cpp
index 19e6c078f..40a0c9e73 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -30,8 +30,8 @@
 #include <sstream>
 #include <vector>
 #include <string>
-#include <cstdlib>
-#include <cinttypes>
+#include <stdlib.h>
+#include <inttypes.h>
 #include <Context.h>
 #include <Datetime.h>
 #include <Duration.h>
diff --git a/src/recur.cpp b/src/recur.cpp
index 70703e4dc..479b1e470 100644
--- a/src/recur.cpp
+++ b/src/recur.cpp
@@ -30,13 +30,13 @@
 #include <fstream>
 #include <sstream>
 #include <sys/types.h>
-#include <cinttypes>
-#include <cstdio>
-#include <cstring>
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
-#include <cstdlib>
+#include <stdlib.h>
 #include <pwd.h>
-#include <ctime>
+#include <time.h>
 #include <Context.h>
 #include <Lexer.h>
 #include <Datetime.h>
diff --git a/src/rules.cpp b/src/rules.cpp
index 494150305..1d67624cb 100644
--- a/src/rules.cpp
+++ b/src/rules.cpp
@@ -25,7 +25,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-#include <cstdlib>
+#include <stdlib.h>
 #include <Context.h>
 #include <Datetime.h>
 #include <shared.h>
diff --git a/src/sort.cpp b/src/sort.cpp
index 3f13f9201..7a7e7eafb 100644
--- a/src/sort.cpp
+++ b/src/sort.cpp
@@ -30,7 +30,7 @@
 #include <list>
 #include <map>
 #include <string>
-#include <cstdlib>
+#include <stdlib.h>
 #include <Context.h>
 #include <Duration.h>
 #include <Task.h>
diff --git a/src/util.cpp b/src/util.cpp
index 814f9aa61..e1e0b8158 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -31,7 +31,7 @@
 #ifdef FREEBSD
 #define _WITH_GETLINE
 #endif
-#include <cstdio>
+#include <stdio.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>
@@ -39,16 +39,16 @@
 #include <algorithm>
 #include <cstring>
 #include <string>
-#include <cstdint>
+#include <stdint.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
-#include <cstdlib>
-#include <cstring>
-#include <csignal>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
 #include <pwd.h>
-#include <csignal>
+#include <signal.h>
 #include <sys/select.h>
 #include <Lexer.h>
 #include <unicode.h>