don't add confusing source info to Jim

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

diff --git a/src/helper/replacements.h b/src/helper/replacements.h
index 27a7f6d50d871600d38255f7e209af2ea81c81ba..3598dd9fefa2f721ac945498d505c419018bcca2 100644 (file)
--- a/src/helper/replacements.h
+++ b/src/helper/replacements.h
@@ -2,7 +2,7 @@
  *   Copyright (C) 2006 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -40,6 +40,12 @@
 #define ENOTSUP 134            /* Not supported */
 #endif
 
+/* for systems that do not support O_BINARY
+ * linux being one of them */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #ifndef HAVE_SYS_TIME_H
 
 #ifndef _TIMEVAL_DEFINED
@@ -65,7 +71,8 @@ struct timezone {
 #endif
 struct timezone;
 
-extern int gettimeofday(struct timeval *tv, struct timezone *tz);
+int gettimeofday(struct timeval *tv, struct timezone *tz);
+
 #endif
 
 #ifndef IN_REPLACEMENTS_C
@@ -105,11 +112,11 @@ void *fill_malloc(size_t size);
 
 /* GNU extensions to the C library that may be missing on some systems */
 #ifndef HAVE_STRNDUP
-extern char* strndup(const char *s, size_t n);
+char* strndup(const char *s, size_t n);
 #endif /* HAVE_STRNDUP */
 
 #ifndef HAVE_STRNLEN
-extern size_t strnlen(const char *s, size_t maxlen);
+size_t strnlen(const char *s, size_t maxlen);
 #endif /* HAVE_STRNLEN */
 
 #ifndef HAVE_USLEEP
@@ -161,7 +168,7 @@ int win_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, struct time
 #endif  /* _WIN32 */
 
 /* generic socket functions for Windows and Posix */
-static __inline int write_socket( int handle, const void *buffer, unsigned int count )
+static __inline int write_socket(int handle, const void *buffer, unsigned int count)
 {
 #ifdef _WIN32
        return send(handle, buffer, count, 0);
@@ -170,7 +177,7 @@ static __inline int write_socket( int handle, const void *buffer, unsigned int c
 #endif
 }
 
-static __inline int read_socket( int handle, void *buffer, unsigned int count )
+static __inline int read_socket(int handle, void *buffer, unsigned int count)
 {
 #ifdef _WIN32
        return recv(handle, buffer, count, 0);
@@ -192,7 +199,7 @@ static __inline void socket_nonblock(int fd)
 {
 #ifdef _WIN32
        unsigned long nonblock = 1;
-       ioctlsocket(fd, FIONBIO, &nonblock );
+       ioctlsocket(fd, FIONBIO, &nonblock);
 #else
        int oldopts = fcntl(fd, F_GETFL, 0);
        fcntl(fd, F_SETFL, oldopts | O_NONBLOCK);
@@ -210,6 +217,8 @@ static __inline int socket_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set
 
 #ifndef HAVE_ELF_H
 
+#include <helper/types.h>
+
 typedef uint32_t       Elf32_Addr;
 typedef uint16_t       Elf32_Half;
 typedef uint32_t       Elf32_Off;