Mercurial > hg > xemacs-beta
changeset 5827:4d7032d36975
Allow building --without-tls on the Windows native platform
| author | Vin Shelton <acs@xemacs.org> |
|---|---|
| date | Mon, 10 Nov 2014 13:43:46 -0500 |
| parents | 98681721a588 |
| children | 0303baa7c4e9 |
| files | nt/ChangeLog nt/xemacs.mak src/ChangeLog src/emacs.c src/number.h src/sysdep.c |
| diffstat | 6 files changed, 32 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/nt/ChangeLog Mon Nov 10 13:22:49 2014 -0500 +++ b/nt/ChangeLog Mon Nov 10 13:43:46 2014 -0500 @@ -1,3 +1,8 @@ +2014-11-10 Vin Shelton <acs@xemacs.org> + + * xemacs.mak (TEXINFO_SRCS): XEmacs sources no longer include + texinfo.texi. + 2014-11-10 Vin Shelton <acs@xemacs.org> * README: Updated contributor information.
--- a/nt/xemacs.mak Mon Nov 10 13:22:49 2014 -0500 +++ b/nt/xemacs.mak Mon Nov 10 13:43:46 2014 -0500 @@ -1495,7 +1495,6 @@ $(INFODIR)\new-users-guide.info \ $(INFODIR)\standards.info \ $(INFODIR)\termcap.info \ - $(INFODIR)\texinfo.info \ $(INFODIR)\widget.info \ $(INFODIR)\xemacs-faq.info \ $(INFODIR)\xemacs.info @@ -1631,14 +1630,6 @@ $(MANDIR)\new-users-guide\region.texi \ $(MANDIR)\new-users-guide\search.texi \ $(MANDIR)\new-users-guide\xmenu.texi - -TEXINFO_SRCS = \ - $(MANDIR)\texinfo\texinfo.texi \ - $(MANDIR)\texinfo\version.texi - -$(INFODIR)\texinfo.info: $(TEXINFO_SRCS) - cd $(MANDIR)\texinfo - $(MAKEINFO) texinfo.texi $(INFODIR)\xemacs.info: $(XEMACS_SRCS) cd $(MANDIR)\xemacs
--- a/src/ChangeLog Mon Nov 10 13:22:49 2014 -0500 +++ b/src/ChangeLog Mon Nov 10 13:43:46 2014 -0500 @@ -1,3 +1,10 @@ +2014-11-06 Vin Shelton <acs@xemacs.org> + + * sysdep.c (set_descriptor_non_blocking): Don't call ioctl() on + Windows native builds. + * emacs.c (main_1): Conditionalize tls variables and initialization. + * number.h: Elide Visual Studio warnings on NUMBER_TYPES expansion. + 2014-11-05 Jerry James <james@xemacs.org> * ExternalClient-Xlib.c (ExternalClientEventHandler): Cast integer
--- a/src/emacs.c Mon Nov 10 13:22:49 2014 -0500 +++ b/src/emacs.c Mon Nov 10 13:43:46 2014 -0500 @@ -1606,7 +1606,9 @@ syms_of_scrollbar (); #endif syms_of_text (); +#ifdef WITH_TLS syms_of_tls (); +#endif #ifdef HAVE_TOOLBARS syms_of_toolbar (); #endif @@ -2217,7 +2219,9 @@ vars_of_symbols (); vars_of_syntax (); vars_of_text (); +#ifdef WITH_TLS vars_of_tls (); +#endif #ifdef HAVE_TOOLBARS vars_of_toolbar (); #endif @@ -2680,8 +2684,10 @@ init_device_tty (); #endif init_console_stream (restart); /* Create the first console */ +#ifdef WITH_TLS if (initialized && !restart) init_tls (); +#endif /* try to get the actual pathname of the exec file we are running */ if (!restart)
--- a/src/number.h Mon Nov 10 13:22:49 2014 -0500 +++ b/src/number.h Mon Nov 10 13:43:46 2014 -0500 @@ -376,9 +376,21 @@ #define NUMBER_TYPES(prefix) prefix##FIXNUM_T, prefix##BIGNUM_T, \ prefix##RATIO_T, prefix##FLOAT_T, prefix##BIGFLOAT_T +#ifdef _MSC_VER +/* Disable warning 4003: + * warning C4003: not enough actual parameters for macro 'NUMBER_TYPES' + */ +#pragma warning( push ) +#pragma warning( disable : 4003) +#endif + enum number_type { NUMBER_TYPES() }; enum lazy_number_type { NUMBER_TYPES(LAZY_), LAZY_MARKER_T }; +#ifdef _MSC_VER +#pragma warning( pop ) +#endif + #undef NUMBER_TYPES extern enum number_type get_number_type (Lisp_Object);
--- a/src/sysdep.c Mon Nov 10 13:22:49 2014 -0500 +++ b/src/sysdep.c Mon Nov 10 13:43:46 2014 -0500 @@ -188,11 +188,13 @@ lowry@watson.ibm.com (Andy Lowry). */ /* #### Should this be conditionalized on FIONBIO? */ #if defined (STRIDE) || (defined (pfa) && defined (HAVE_PTYS)) || defined (AIX) +#if !defined(WIN32_NATIVE) { int one = 1; ioctl (fd, FIONBIO, &one); } #endif +#endif #ifdef F_SETFL fcntl (fd, F_SETFL, O_NONBLOCK);