Mercurial > hg > xemacs-beta
changeset 4879:c356806cc933
fix compile errors when --with-msw=no
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-16 Ben Wing <ben@xemacs.org>
* common/Makefile.common:
* common/Makefile.common (.PHONY):
Use WIN32_ANY not HAVE_MS_WINDOWS so we still link with the
import library even when --with-msw=no.
src/ChangeLog addition:
2010-01-16 Ben Wing <ben@xemacs.org>
* win32.c (mswindows_read_link_1):
Conditionalize COM support on HAVE_MS_WINDOWS because otherwise we
haven't linked with the appropriate libraries.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 16 Jan 2010 06:50:01 -0600 |
| parents | 3a4e815c821d |
| children | ae81a2c00f4f |
| files | modules/ChangeLog modules/common/Makefile.common src/ChangeLog src/win32.c |
| diffstat | 4 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/modules/ChangeLog Fri Jan 15 07:48:17 2010 -0600 +++ b/modules/ChangeLog Sat Jan 16 06:50:01 2010 -0600 @@ -1,3 +1,10 @@ +2010-01-16 Ben Wing <ben@xemacs.org> + + * common/Makefile.common: + * common/Makefile.common (.PHONY): + Use WIN32_ANY not HAVE_MS_WINDOWS so we still link with the + import library even when --with-msw=no. + 2010-01-11 Ben Wing <ben@xemacs.org> * ldap/eldap.c (Fldap_search_basic):
--- a/modules/common/Makefile.common Fri Jan 15 07:48:17 2010 -0600 +++ b/modules/common/Makefile.common Sat Jan 16 06:50:01 2010 -0600 @@ -59,7 +59,7 @@ INSTALL_PROGRAM=@MOD_INSTALL_PROGRAM@ OBJECT_TO_BUILD=@OBJECT_TO_BUILD@ LIBSTDCPP=@LIBSTDCPP@ -#ifdef HAVE_MS_WINDOWS +#ifdef WIN32_ANY IMPORT_LIB=../../src/xemacs-import.a #endif
--- a/src/ChangeLog Fri Jan 15 07:48:17 2010 -0600 +++ b/src/ChangeLog Sat Jan 16 06:50:01 2010 -0600 @@ -1,3 +1,9 @@ +2010-01-16 Ben Wing <ben@xemacs.org> + + * win32.c (mswindows_read_link_1): + Conditionalize COM support on HAVE_MS_WINDOWS because otherwise we + haven't linked with the appropriate libraries. + 2010-01-15 Ben Wing <ben@xemacs.org> * doprnt.c (emacs_doprnt_1):
--- a/src/win32.c Fri Jan 15 07:48:17 2010 -0600 +++ b/src/win32.c Sat Jan 16 06:50:01 2010 -0600 @@ -418,7 +418,7 @@ static Ibyte * mswindows_read_link_1 (const Ibyte *fname) { -#ifdef NO_CYGWIN_COM_SUPPORT +#if defined (NO_CYGWIN_COM_SUPPORT) || !defined (HAVE_MS_WINDOWS) return NULL; #else Ibyte *retval = NULL;