Mercurial > hg > xemacs-beta

diff src/syswindows.h @ 1111:184461bc8de4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-11-18 06:52:23 by ben] warning fixes, etc. * s/cygwin32.h: -fvtable-thunks is obsolete in GCC 3 and generates warnings. * s/mingw32.h: * s/windowsnt.h: Comment fixes. * emodules.h: Fix warnings from redefining symbols. * eval.c: Fix C++ errors -- no automatic casting between function pointers and void *, function declarations inside of functions not allowed. * event-Xt.c (emacs_Xt_enqueue_focus_event): Warning fixes. * fileio.c (Ffile_truename): Warning fixes. Use LOCAL_TO_WIN32_FILE_FORMAT rather than duplicating it. * glyphs-x.c: Fix style. * intl-auto-encap-win32.c: * intl-auto-encap-win32.h: * intl-encap-win32.c: * intl-encap-win32.c (qxeRegConnectRegistry): * syswindows.h (RegConnectRegistry): DdeCreateStringHandle needs to be manual due to new Cygwin bug. * intl-win32.c: wcslen/wcscmp don't seem to exist under G++ 3, Cygwin. * lisp.h: * lisp-union.h: * lisp-disunion.h: * process-unix.c (unix_send_process): Ugh, C needs volatile and C++ must not have volatile. Remove previous volatile hacks, which don't seem to be working any more. * sheap.c (STATIC_HEAP_SLOP): Try to get a working Cygwin build with old unexec. * sheap.c (more_static_core): No NL's in literals allowed. * symbols.c (Fset): Fix C++ errors. * syswindows.h: Fix Cygwin complaints now that some missing structs have been added. aclocal.m4: Disable shared library modules under Cygwin for the moment, since we need some more tricky coding done and I don't have the time right now. configure.in, configure.usage: code-files.el, loadhist.el: Fix warnings. package-get.el: Fix warnings. NOTE: This was already fixed awhile ago, but reverted by Steve Y. Please be careful. postgresql/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) postgresql/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. postgresql/postgresql.c: Fix warning. ldap/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) ldap/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. common/Makefile.common: Common stuff is here.
author ben
date Mon, 18 Nov 2002 06:53:08 +0000
parents 79c6ff3eef26
children e22b0213b713
line wrap: on
line diff
--- a/src/syswindows.h	Sun Nov 17 22:53:08 2002 +0000
+++ b/src/syswindows.h	Mon Nov 18 06:53:08 2002 +0000
@@ -296,72 +296,87 @@
 #define CBEMAXSTRLEN 260
 #endif
 
-typedef struct {
-        NMHDR hdr;
-        BOOL fChanged;
-        int iNewSelection;
-        WCHAR szText[CBEMAXSTRLEN];
-        int iWhy;
+#ifndef NMCBEENDEDIT
+
+typedef struct
+{
+  NMHDR hdr;
+  BOOL fChanged;
+  int iNewSelection;
+  WCHAR szText[CBEMAXSTRLEN];
+  int iWhy;
 } NMCBEENDEDITW, *LPNMCBEENDEDITW, *PNMCBEENDEDITW;
 
-typedef struct {
-        NMHDR hdr;
-        BOOL fChanged;
-        int iNewSelection;
-        char szText[CBEMAXSTRLEN];
-        int iWhy;
+typedef struct
+{
+  NMHDR hdr;
+  BOOL fChanged;
+  int iNewSelection;
+  char szText[CBEMAXSTRLEN];
+  int iWhy;
 } NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA;
 
+#endif /* not NMCBEENDEDIT */
+
 #if (_WIN32_IE >= 0x0400)
 
-typedef struct {
-    NMHDR hdr;
-    int   iItemid;
-    WCHAR szText[CBEMAXSTRLEN];
-}NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW;
+#ifndef NMCBEDRAGBEGIN
+
+typedef struct
+{
+  NMHDR hdr;
+  int   iItemid;
+  WCHAR szText[CBEMAXSTRLEN];
+} NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW;
 
-typedef struct {
-    NMHDR hdr;
-    int   iItemid;
-    char szText[CBEMAXSTRLEN];
-}NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
+typedef struct
+{
+  NMHDR hdr;
+  int   iItemid;
+  char szText[CBEMAXSTRLEN];
+} NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
+
+#endif /* not NMCBEDRAGBEGIN */
+
 typedef struct tagNMDATETIMEFORMATA
 {
-    NMHDR nmhdr;
-    LPCSTR  pszFormat;
-    SYSTEMTIME st;
-    LPCSTR pszDisplay;
-    CHAR szDisplay[64];
+  NMHDR nmhdr;
+  LPCSTR  pszFormat;
+  SYSTEMTIME st;
+  LPCSTR pszDisplay;
+  CHAR szDisplay[64];
 } NMDATETIMEFORMATA, FAR * LPNMDATETIMEFORMATA;
 
 typedef struct tagNMDATETIMEFORMATW
 {
-    NMHDR nmhdr;
-    LPCWSTR pszFormat;
-    SYSTEMTIME st;
-    LPCWSTR pszDisplay;
-    WCHAR szDisplay[64];
+  NMHDR nmhdr;
+  LPCWSTR pszFormat;
+  SYSTEMTIME st;
+  LPCWSTR pszDisplay;
+  WCHAR szDisplay[64];
 } NMDATETIMEFORMATW, FAR * LPNMDATETIMEFORMATW;
 
-typedef struct tagNMTTDISPIFNOA {
-    NMHDR hdr;
-    LPSTR lpszText;
-    char szText[80];
-    HINSTANCE hinst;
-    UINT uFlags;
+typedef struct tagNMTTDISPIFNOA
+{
+  NMHDR hdr;
+  LPSTR lpszText;
+  char szText[80];
+  HINSTANCE hinst;
+  UINT uFlags;
 #if (_WIN32_IE >= 0x0300)
-    LPARAM lParam;
+  LPARAM lParam;
 #endif
 } NMTTDISPINFOA, FAR *LPNMTTDISPINFOA;
 
-typedef struct tagNMTTDISPINFOW {
-    NMHDR hdr;
-    LPWSTR lpszText;
-    WCHAR szText[80];
-    HINSTANCE hinst;
-    UINT uFlags;
+typedef struct tagNMTTDISPINFOW
+{
+  NMHDR hdr;
+  LPWSTR lpszText;
+  WCHAR szText[80];
+  HINSTANCE hinst;
+  UINT uFlags;
 #if (_WIN32_IE >= 0x0300)
-    LPARAM lParam;
+  LPARAM lParam;
 #endif
 } NMTTDISPINFOW, FAR *LPNMTTDISPINFOW;
 
@@ -539,6 +554,12 @@
 /* would be encapsulatable but for Cygwin problems */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
+#undef DdeCreateStringHandle
+#define DdeCreateStringHandle error use qxeDdeCreateStringHandle or DdeCreateStringHandleA/DdeCreateStringHandleW
+#endif
+HSZ qxeDdeCreateStringHandle (DWORD idInst, const Extbyte * psz, int iCodePage);
+
+#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef RegConnectRegistry
 #define RegConnectRegistry error use qxeRegConnectRegistry or RegConnectRegistryA/RegConnectRegistryW
 #endif