Mercurial > hg > xemacs-beta
view nt/x11.patch @ 4903:70089046adef
fix compile problems in intl-encap* under VS6
-------------------- ChangeLog entries follow: --------------------
lib-src/ChangeLog addition:
2010-01-30 Ben Wing <ben@xemacs.org>
* make-mswin-unicode.pl:
Make it possible to specify an overridden prototype in cases where
either Cygwin or Visual Studio has errors in their headers that
can be corrected by falling back to a less qualified type (typically
without const).
src/ChangeLog addition:
2010-01-30 Ben Wing <ben@xemacs.org>
* intl-auto-encap-win32.c:
* intl-auto-encap-win32.c (qxeExtractAssociatedIcon):
* intl-auto-encap-win32.c (qxeExtractIconEx):
* intl-auto-encap-win32.c (qxeCreateMDIWindow):
* intl-auto-encap-win32.c (qxeCreateWindowStation):
* intl-auto-encap-win32.c (qxeDdeCreateStringHandle):
* intl-auto-encap-win32.c (qxeAbortSystemShutdown):
* intl-auto-encap-win32.c (qxeRegConnectRegistry):
* intl-auto-encap-win32.c (qxeGetICMProfile):
* intl-auto-encap-win32.h:
Rebuild.
* intl-encap-win32.c:
* intl-encap-win32.c (qxeUpdateICMRegKey):
Delete manual definitions of functions with former errors in
Cygwin headers but no longer. Use "override" with some functions
where Cygwin or VS6 accidentally omits a const declaration or
includes an extra one. Use "no" on SendMessageTimeout, which
has an error in the VS6 prototype (you could manually fix this
with an ifdef to split the Cygwin vs. VS6 calls, if we ever
actually used this function).
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 30 Jan 2010 20:34:23 -0600 |
| parents | 15872534500d |
| children |
line wrap: on
line source
*** X11.def.old Thu Apr 10 07:29:27 1997 --- X11.def Wed Jul 02 22:20:16 1997 *************** *** 5,15 **** VERSION 6.1 EXPORTS _Xdebug_p=_Xdebug CONSTANT - _XCreateMutex_fn_p=_XCreateMutex_fn CONSTANT - _XFreeMutex_fn_p=_XFreeMutex_fn CONSTANT - _XLockMutex_fn_p=_XLockMutex_fn CONSTANT - _XUnlockMutex_fn_p=_XUnlockMutex_fn CONSTANT - _Xglobal_lock_p=_Xglobal_lock CONSTANT XActivateScreenSaver XAddConnectionWatch XAddExtension --- 5,10 ---- *************** *** 623,630 **** _XUnregisterFilter _XUnregisterInternalConnection _XVIDtoVisual - _Xthread_init - _Xthread_waiter XkbIgnoreExtension XkbOpenDisplay XkbQueryExtension --- 618,623 ----