Index: README
==================================================================
--- README
+++ README
@@ -53,38 +53,30 @@
 	It is possible to disable ALL logging from filed.  When logging is
 	completely disabled interlocks (mutexes) for the logging pointer are
 	not engaged and the logging functions are not compiled at all.
 	This results in a slightly smaller and faster binary
 
-   2. Kill idle connections (CFLAGS, -DFILED_DONT_TIMEOUT=1)
-        Killing idle connections relies heavily upon C11 atomics.  This
-        requires a relatively new version of GCC (4.9+) or other C compiler
-        that implements this aspect of C11 and so it can be disabled at
-        compile time (which is the only time it makes sense).  One day an
-        alternate implementation might be present that uses a mutex instead
-        of atomics at which point this documentation will be updated.
-
-   3. Debugging (CFLAGS, -DFILED_DEBUG=1)
+   2. Debugging (CFLAGS, -DFILED_DEBUG=1)
 	This is an internal option and should only be used during development.
 
-   4. Differing HTTP semantics (CFLAGS, -DFILED_NONBLOCK_HTTP=1)
+   3. Differing HTTP semantics (CFLAGS, -DFILED_NONBLOCK_HTTP=1)
 	It is possible that some HTTP clients may not process the HTTP stream
 	being delivered if they cannot write to the HTTP stream itself.  This
 	has not been observed yet, but it is possible.  If these semantics are
 	needed (and they should not be) then they can be enabled with this
 	flag at the cost of performance.
 
-   5. Differing chroot() semantics (CFLAGS, -DFILED_FAKE_CHROOT=1)
+   4. Differing chroot() semantics (CFLAGS, -DFILED_FAKE_CHROOT=1)
         In some cases it is desirable to mangle paths with a path prefix
         rather than call chroot() at startup.  This is less secure and slower
         and should be generally avoided -- however it may be necessary to do.
         In these cases the executable may be compiled with the
         FILED_FAKE_CHROOT C preprocessor macro defined and instead of calling
         chroot() all HTTP requests will have the root suffix specified as the
         argument to the "-r" or "--root" option prepended to them.
 
-   6. MIME Types (MIMETYPES)
+   5. MIME Types (MIMETYPES)
 	For single-file convenience "filed" compiles the mapping of file
 	extensions (the string in the filename following its last dot ("."))
 	into the executable.  This mapping comes from a file in the format of
 		type1   type1_extension1 type1_extension2...
 		type2   type2_extension1 type2_extension2...
@@ -101,20 +93,5 @@
 and re-open log files, must be used.  Any process may be used for writing logs
 but if the process does not support log rotation then it will not provide that
 benefit.  For example, if you wish to write logs to syslogd(8) you can use
 logger(1), such as:
 	# ./filed --root /www --user nobody --log '|logger -t filed' --daemon
-
-Troubleshooting
----------------
-   1. It won't compile, something about stdatomic.h not found or _Atomic not
-      a valid type.
-
-      => This is a bug in your compiler:
-            https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016
-
-         GCC 4.7.x and 4.8.x define the macro indicating that they have C11
-         support and do not define the macro that C11 requires to indicate
-         that C11 atomics are not available.  They should define that macro.
-
-         You can disable the features in "filed" that require C11 atomics by
-         defining FILED_DONT_TIMEOUT in the Makefile.

Index: filed.c
==================================================================
--- filed.c
+++ filed.c
@@ -41,35 +41,10 @@
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>
 #include <pwd.h>
 
-/*
- * Determine if the C compiler supports C11 atomics
- */
-#if __STDC_VERSION__ >= 201112L
-#  ifndef __STDC_NO_ATOMICS__
-#    define FILED_FEATURE_C11_ATOMICS 1
-#  endif
-#endif
-
-/*
- * If the C compiler does not support C11 atomics, disable TIMEOUT support
- * since it relies upon it
- */
-#ifndef FILED_FEATURE_C11_ATOMICS
-#  define FILED_DONT_TIMEOUT 1
-#endif
-
-/*
- * These headers are only required for TIMEOUT support
- */
-#ifndef FILED_DONT_TIMEOUT
-#include <stdatomic.h>
-#include <stdbool.h>
-#endif
-
 /* Compile time constants */
 #define FILED_VERSION "1.19"
 #define FILED_SENDFILE_MAX 16777215
 #define FILED_MAX_FAILURE_COUNT 30
 #define FILED_DEFAULT_TYPE "application/octet-stream"
@@ -83,11 +58,10 @@
 #define LOG_FILE "-"
 
 /* Fuzzing Test Code */
 #ifdef FILED_TEST_AFL
 #define FILED_DONT_LOG 1
-#define FILED_DONT_TIMEOUT 1
 #define pthread_create(a, x, y, z) afl_pthread_create(a, x, y, z)
 #define bind(x, y, z) afl_bind(x, y, z)
 #define socket(x, y, z) 8193
 #define listen(x, y) 0
 #define accept(x, y, z) afl_accept(x, y, z)
@@ -626,15 +600,15 @@
 #define filed_sockettimeout_accept(x) /**/
 #define filed_sockettimeout_processing_start(x) /**/
 #define filed_sockettimeout_processing_end(x) /**/
 #define filed_sockettimeout_close(x) /**/
 #else
-_Atomic time_t filed_sockettimeout_time;
+time_t filed_sockettimeout_time;
 struct {
-	_Atomic time_t expiration_time;
-	_Atomic pthread_t thread_id;
-	bool valid;
+	time_t expiration_time;
+	pthread_t thread_id;
+	int valid;
 }* filed_sockettimeout_sockstatus;
 long filed_sockettimeout_sockstatus_length;
 int filed_sockettimeout_devnull_fd;
 
 static int filed_sockettimeout_sockfd_in_range(int sockfd) {
@@ -708,11 +682,11 @@
 static void *filed_sockettimeout_thread(void *arg) {
 	time_t now, expiration_time;
 	pthread_t thread_id;
 	long idx;
 	int count;
-	bool valid;
+	int valid;
 
 	while (1) {
 		for (count = 0; count < 10; count++) {
 			usleep(30000000);