openocd: remove last NULL comparisons

[fw/openocd] / src / helper / system.h

diff --git a/src/helper/system.h b/src/helper/system.h
index 3fb42c08c15b1e27bd6348580182c4b917d8305d..0d8be648cb927c976d2d719041f6ce9924c8b2ef 100644 (file)
--- a/src/helper/system.h
+++ b/src/helper/system.h
@@ -18,8 +18,17 @@
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef SYSTEM_H
-#define SYSTEM_H
+#ifndef OPENOCD_HELPER_SYSTEM_H
+#define OPENOCD_HELPER_SYSTEM_H
+
+/* +++ platform specific headers +++ */
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+/* --- platform specific headers --- */
 
 /* standard C library header files */
 #include <stdio.h>
@@ -28,28 +37,11 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
+#include <time.h>
 
-/* +++ AC_HEADER_TIME +++ */
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
-/* --- AC_HEADER_TIME --- */
-
-/* +++ platform specific headers +++ */
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-/* --- platform specific headers --- */
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
@@ -86,4 +78,4 @@
 #define false   0
 #endif
 
-#endif /* SYSTEM_H */
+#endif /* OPENOCD_HELPER_SYSTEM_H */