From 6f72a191baf2f5023f92d81f4c10e3d88196fce8 Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Fri, 17 Apr 2020 20:34:27 +0100
Subject: [PATCH] Revert "Add feature flags and missing #includes."

This reverts commit dd5fa236ae1dbd7451420420b0f40f05708bc3c2.

Also, set `-std=gnu99` in Bazel build.
---
 BUILD.bazel           | 1 +
 src/audio_call.c      | 1 -
 src/audio_device.c    | 3 ---
 src/autocomplete.c    | 2 --
 src/chat_commands.c   | 1 -
 src/configdir.c       | 1 -
 src/execute.c         | 1 -
 src/file_transfers.h  | 1 -
 src/global_commands.c | 1 -
 src/line_info.c       | 1 -
 src/misc_tools.c      | 3 ---
 src/misc_tools.h      | 1 -
 src/name_lookup.c     | 1 -
 src/settings.c        | 1 -
 src/settings.h        | 1 -
 src/term_mplex.c      | 1 -
 src/toxic.c           | 2 --
 src/video_call.c      | 1 -
 src/video_device.c    | 1 -
 src/xtra.c            | 1 -
 20 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index 380c197..c1dc631 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -16,6 +16,7 @@ cc_binary(
         "//tools/config:osx": [],
     }),
     copts = [
+        "-std=gnu99",
         "-DAUDIO",
         "-DPACKAGE_DATADIR='\"data\"'",
         "-DPYTHON",
diff --git a/src/audio_call.c b/src/audio_call.c
index 07b642f..8b2ca5a 100644
--- a/src/audio_call.c
+++ b/src/audio_call.c
@@ -41,7 +41,6 @@
 #include <stdbool.h>
 #include <curses.h>
 #include <string.h>
-#include <strings.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/audio_device.c b/src/audio_device.c
index 51e39b3..a24fc13 100644
--- a/src/audio_device.c
+++ b/src/audio_device.c
@@ -20,9 +20,6 @@
  *
  */
 
-/* TODO(iphydf): use nanosleep instead of usleep */
-#define _XOPEN_SOURCE 500
-
 #include "audio_device.h"
 
 #ifdef AUDIO
diff --git a/src/autocomplete.c b/src/autocomplete.c
index f140725..45eb321 100644
--- a/src/autocomplete.c
+++ b/src/autocomplete.c
@@ -22,9 +22,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <limits.h>
-#include <sys/param.h>
 
 #ifdef __APPLE__
 #include <sys/types.h>
diff --git a/src/chat_commands.c b/src/chat_commands.c
index 6a4e96d..0e857f4 100644
--- a/src/chat_commands.c
+++ b/src/chat_commands.c
@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "toxic.h"
 #include "windows.h"
diff --git a/src/configdir.c b/src/configdir.c
index daef6c4..8d69dc6 100644
--- a/src/configdir.c
+++ b/src/configdir.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _POSIX_C_SOURCE 200809L
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/execute.c b/src/execute.c
index 01998b9..2bbf134 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
diff --git a/src/file_transfers.h b/src/file_transfers.h
index b7b2681..eb7fa9f 100644
--- a/src/file_transfers.h
+++ b/src/file_transfers.h
@@ -24,7 +24,6 @@
 #define FILE_TRANSFERS_H
 
 #include <limits.h>
-#include <sys/param.h>
 
 #include "toxic.h"
 #include "windows.h"
diff --git a/src/global_commands.c b/src/global_commands.c
index c01fb18..cd9b677 100644
--- a/src/global_commands.c
+++ b/src/global_commands.c
@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "toxic.h"
 #include "windows.h"
diff --git a/src/line_info.c b/src/line_info.c
index 535f746..b6a414e 100644
--- a/src/line_info.c
+++ b/src/line_info.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _DEFAULT_SOURCE
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
diff --git a/src/misc_tools.c b/src/misc_tools.c
index ba316df..953e863 100644
--- a/src/misc_tools.c
+++ b/src/misc_tools.c
@@ -20,12 +20,9 @@
  *
  */
 
-#define _POSIX_C_SOURCE 200809L
-#define _XOPEN_SOURCE 500
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include <strings.h>
 #include <time.h>
 #include <limits.h>
 #include <dirent.h>
diff --git a/src/misc_tools.h b/src/misc_tools.h
index 8dc0686..551f62b 100644
--- a/src/misc_tools.h
+++ b/src/misc_tools.h
@@ -23,7 +23,6 @@
 #define MISC_TOOLS_H
 
 #include <sys/stat.h>
-#include <sys/types.h>
 
 #include "windows.h"
 #include "toxic.h"
diff --git a/src/name_lookup.c b/src/name_lookup.c
index 674cdf9..bed5a17 100644
--- a/src/name_lookup.c
+++ b/src/name_lookup.c
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <strings.h>
 #include <curl/curl.h>
 
 #include "toxic.h"
diff --git a/src/settings.c b/src/settings.c
index 179b1cf..6490112 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <libconfig.h>
 #include <ctype.h>
 
diff --git a/src/settings.h b/src/settings.h
index 36b11fa..b3831b6 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -24,7 +24,6 @@
 #define SETTINGS_H
 
 #include <limits.h>
-#include <sys/param.h>
 
 #include <tox/tox.h>
 
diff --git a/src/term_mplex.c b/src/term_mplex.c
index 5e183f4..1420549 100644
--- a/src/term_mplex.c
+++ b/src/term_mplex.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _POSIX_C_SOURCE 2
 #include <limits.h> /* PATH_MAX */
 #include <stdio.h>  /* fgets, popen, pclose */
 #include <stdlib.h> /* malloc, realloc, free, getenv */
diff --git a/src/toxic.c b/src/toxic.c
index c0960a3..c127f24 100644
--- a/src/toxic.c
+++ b/src/toxic.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 500
 #include <curses.h>
 #include <errno.h>
 #include <stdio.h>
@@ -31,7 +30,6 @@
 #include <signal.h>
 #include <locale.h>
 #include <string.h>
-#include <strings.h>
 #include <time.h>
 #include <pthread.h>
 #include <getopt.h>
diff --git a/src/video_call.c b/src/video_call.c
index 473eafe..d627c2e 100644
--- a/src/video_call.c
+++ b/src/video_call.c
@@ -33,7 +33,6 @@
 #include <stdbool.h>
 #include <curses.h>
 #include <string.h>
-#include <strings.h>
 #include <pthread.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/video_device.c b/src/video_device.c
index 44d33b7..b07cefc 100644
--- a/src/video_device.c
+++ b/src/video_device.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 500
 #include "video_device.h"
 #include "video_call.h"
 
diff --git a/src/xtra.c b/src/xtra.c
index 934d5a4..f81c671 100644
--- a/src/xtra.c
+++ b/src/xtra.c
@@ -20,7 +20,6 @@
  *
  */
 
-#define _XOPEN_SOURCE 500
 #include "xtra.h"
 #include "misc_tools.h"