From 95b161f67718bee54c4713e173167a43162a01d9 Mon Sep 17 00:00:00 2001 From: borutr Date: Tue, 1 Nov 2005 12:28:48 +0000 Subject: [PATCH] * sim/ucsim/app.cc, sim/ucsim/cmd.src/cmdutil.cc, sim/ucsim/cmd.src/newcmd.cc: enabled sockets on WIN32 git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3927 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- ChangeLog | 5 +++++ sim/ucsim/app.cc | 11 ++++++++--- sim/ucsim/cmd.src/cmdutil.cc | 5 ++++- sim/ucsim/cmd.src/newcmd.cc | 9 +++++++-- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b7d5e39..86aa98d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-01 Borut Razem + + * sim/ucsim/app.cc, sim/ucsim/cmd.src/cmdutil.cc, sim/ucsim/cmd.src/newcmd.cc: + enabled sockets on WIN32 + 2005-10-31 Borut Razem * support/regression/generate-cases.py: escape backslashes in {testcase}: diff --git a/sim/ucsim/app.cc b/sim/ucsim/app.cc index f357afef..bc8e81a4 100644 --- a/sim/ucsim/app.cc +++ b/sim/ucsim/app.cc @@ -30,12 +30,17 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#include +#ifdef HAVE_UNISTD_H +# include +#endif #ifdef HAVE_GETOPT_H # include #endif -#ifdef SOCKET_AVAIL -#include +#ifdef _WIN32 +# include +# define SOCKET_AVAIL +#elif defined HAVE_SYS_SOCKET_H +# include #endif #include #include diff --git a/sim/ucsim/cmd.src/cmdutil.cc b/sim/ucsim/cmd.src/cmdutil.cc index 86fd4c54..d27a335f 100644 --- a/sim/ucsim/cmd.src/cmdutil.cc +++ b/sim/ucsim/cmd.src/cmdutil.cc @@ -31,7 +31,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#ifdef HAVE_SYS_SOCKET_H +#ifdef _WIN32 +# include +# define SOCKET_AVAIL +#elif defined HAVE_SYS_SOCKET_H # include # include # include diff --git a/sim/ucsim/cmd.src/newcmd.cc b/sim/ucsim/cmd.src/newcmd.cc index e0ee99c3..fb1053ab 100644 --- a/sim/ucsim/cmd.src/newcmd.cc +++ b/sim/ucsim/cmd.src/newcmd.cc @@ -32,7 +32,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#ifdef HAVE_SYS_SOCKET_H +#ifdef _WIN32 +# include +# define SOCKET_AVAIL +#elif defined HAVE_SYS_SOCKET_H # include # include # include @@ -42,7 +45,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #if FD_HEADER_OK # include HEADER_FD #endif -#include +#ifdef HAVE_UNISTD_H +# include +#endif #include "i_string.h" #include "cmdlexcl.h" -- 2.30.2