diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/luatex.c')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/luatex.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index 06ec012cc93..a257b60e383 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.c +++ b/Build/source/texk/web2c/luatexdir/luatex.c @@ -15,16 +15,16 @@ #include "luatex_svnversion.h" static const char _svn_version[] = - "$Id: luatex.c 4117 2011-04-11 07:58:32Z taco $ " - "$URL: http://foundry.supelec.fr/svn/luatex/tags/beta-0.66.0/source/texk/web2c/luatexdir/luatex.c $"; + "$Id: luatex.c 4248 2011-05-05 13:56:58Z taco $ " + "$URL: http://foundry.supelec.fr/svn/luatex/branches/0.70.x/source/texk/web2c/luatexdir/luatex.c $"; #define TeX int luatex_svn = luatex_svn_revision; -int luatex_version = 66; /* \.{\\luatexversion} */ +int luatex_version = 70; /* \.{\\luatexversion} */ int luatex_revision = '0'; /* \.{\\luatexrevision} */ int luatex_date_info = -extra_version_info; /* the compile date is negated */ -const char *luatex_version_string = "beta-0.66.0"; +const char *luatex_version_string = "beta-0.70.0"; const char *engine_name = "luatex"; /* the name of this engine */ #include <kpathsea/c-ctype.h> @@ -576,9 +576,6 @@ static void ipc_open_out(void) { #ifdef WIN32 u_long mode = 1; -#define SOCK_NONBLOCK(s) ioctlsocket (s, FIONBIO, &mode) -#else -#define SOCK_NONBLOCK(s) fcntl (s, F_SETFL, O_NONBLOCK) #endif # ifdef IPC_DEBUG fputs("tex: Opening socket for IPC output ...\n", stderr); @@ -594,8 +591,13 @@ static void ipc_open_out(void) sock = socket(PF_UNIX, SOCK_STREAM, 0); if (sock >= 0) { - if (connect(sock, ipc_addr, ipc_addr_len) != 0 - || SOCK_NONBLOCK (sock) < 0) { + if (connect(sock, ipc_addr, ipc_addr_len) != 0 || +#ifdef WIN32 + ioctlsocket (sock, FIONBIO, &mode) < 0 +#else + fcntl (sock, F_SETFL, O_NONBLOCK) < 0 +#endif + ) { close(sock); sock = -1; return; |