Convert to non-recursive make

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

diff --git a/src/helper/system.h b/src/helper/system.h
index 85e0b1ee91413c76278816453b89b2e9dd2a8c5e..97b3443bedb543ac5351ffd0a82fa0aa91ad3236 100644 (file)
--- a/src/helper/system.h
+++ b/src/helper/system.h
@@ -15,13 +15,11 @@
  *   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
+#ifndef OPENOCD_HELPER_SYSTEM_H
+#define OPENOCD_HELPER_SYSTEM_H
 
 /* standard C library header files */
 #include <stdio.h>
@@ -45,9 +43,6 @@
 /* --- AC_HEADER_TIME --- */
 
 /* +++ platform specific headers +++ */
-#if BUILD_ECOSBOARD == 1
-#include <pkgconf/system.h>
-#endif
 #ifdef _WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -59,8 +54,8 @@
 #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
@@ -91,4 +86,4 @@
 #define false   0
 #endif
 
-#endif /* SYSTEM_H */
+#endif /* OPENOCD_HELPER_SYSTEM_H */