helper/command: pass command prefix to command registration

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

diff --git a/src/helper/system.h b/src/helper/system.h
index 82d0cae7e8b1027d0134c30f60efa6a25597762e..1aaca3b33e767b4e8a234f23fb87af67cc57e0b7 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>
@@ -30,19 +28,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
@@ -56,8 +46,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
@@ -88,4 +78,4 @@
 #define false   0
 #endif
 
-#endif /* SYSTEM_H */
+#endif /* OPENOCD_HELPER_SYSTEM_H */