X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fhelper%2Fsystem.h;h=0d8be648cb927c976d2d719041f6ce9924c8b2ef;hb=0c5ca348ec70663f89a9a4e3b2d96d75787d431f;hp=169df1cb4f28945d062263cd79fe7f5cab479782;hpb=aee65603eed39e761258813e33e612e65e1ad751;p=fw%2Fopenocd

diff --git a/src/helper/system.h b/src/helper/system.h
index 169df1cb4..0d8be648c 100644
--- a/src/helper/system.h
+++ b/src/helper/system.h
@@ -15,55 +15,45 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef SYSTEM_H
-#define SYSTEM_H
 
-// standard C library header files
+#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>
 #include <stdlib.h>
 #include <string.h>
 #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
-#endif
-// --- AC_HEADER_TIME ---
-
-// +++ platform specific headers +++
-#if BUILD_ECOSBOARD == 1
-#include <pkgconf/system.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-// --- platform specific headers ---
 
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#ifdef HAVE_SYS_POLL_H
-#include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
 #endif
 
 #ifdef __ECOS
 /* missing from eCos */
 #ifndef EFAULT
-#define	EFAULT 14	/* Bad address */
+#define EFAULT 14	/* Bad address */
 #endif
 #endif
 
@@ -71,10 +61,10 @@
 #include <netinet/in.h>
 #endif
 #ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h> /* select, FD_SET and friends (POSIX.1-2001) */
+#include <sys/select.h>	/* select, FD_SET and friends (POSIX.1-2001) */
 #endif
 #ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h> /* for MIN/MAX macros */
+#include <sys/param.h>	/* for MIN/MAX macros */
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -83,4 +73,9 @@
 #include <fcntl.h>
 #endif
 
-#endif // SYSTEM_H
+#ifndef true
+#define true    1
+#define false   0
+#endif
+
+#endif /* OPENOCD_HELPER_SYSTEM_H */