Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
1110:49065a0d2943 1111:184461bc8de4
294 294
295 #ifndef CBEMAXSTRLEN 295 #ifndef CBEMAXSTRLEN
296 #define CBEMAXSTRLEN 260 296 #define CBEMAXSTRLEN 260
297 #endif 297 #endif
298 298
299 typedef struct { 299 #ifndef NMCBEENDEDIT
300 NMHDR hdr; 300
301 BOOL fChanged; 301 typedef struct
302 int iNewSelection; 302 {
303 WCHAR szText[CBEMAXSTRLEN]; 303 NMHDR hdr;
304 int iWhy; 304 BOOL fChanged;
305 int iNewSelection;
306 WCHAR szText[CBEMAXSTRLEN];
307 int iWhy;
305 } NMCBEENDEDITW, *LPNMCBEENDEDITW, *PNMCBEENDEDITW; 308 } NMCBEENDEDITW, *LPNMCBEENDEDITW, *PNMCBEENDEDITW;
306 309
307 typedef struct { 310 typedef struct
308 NMHDR hdr; 311 {
309 BOOL fChanged; 312 NMHDR hdr;
310 int iNewSelection; 313 BOOL fChanged;
311 char szText[CBEMAXSTRLEN]; 314 int iNewSelection;
312 int iWhy; 315 char szText[CBEMAXSTRLEN];
316 int iWhy;
313 } NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA; 317 } NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA;
314 318
319 #endif /* not NMCBEENDEDIT */
320
315 #if (_WIN32_IE >= 0x0400) 321 #if (_WIN32_IE >= 0x0400)
316 322
317 typedef struct { 323 #ifndef NMCBEDRAGBEGIN
318 NMHDR hdr; 324
319 int iItemid; 325 typedef struct
320 WCHAR szText[CBEMAXSTRLEN]; 326 {
321 }NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW; 327 NMHDR hdr;
322 328 int iItemid;
323 typedef struct { 329 WCHAR szText[CBEMAXSTRLEN];
324 NMHDR hdr; 330 } NMCBEDRAGBEGINW, *LPNMCBEDRAGBEGINW, *PNMCBEDRAGBEGINW;
325 int iItemid; 331
326 char szText[CBEMAXSTRLEN]; 332 typedef struct
327 }NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA; 333 {
334 NMHDR hdr;
335 int iItemid;
336 char szText[CBEMAXSTRLEN];
337 } NMCBEDRAGBEGINA, *LPNMCBEDRAGBEGINA, *PNMCBEDRAGBEGINA;
338
339 #endif /* not NMCBEDRAGBEGIN */
340
328 typedef struct tagNMDATETIMEFORMATA 341 typedef struct tagNMDATETIMEFORMATA
329 { 342 {
330 NMHDR nmhdr; 343 NMHDR nmhdr;
331 LPCSTR pszFormat; 344 LPCSTR pszFormat;
332 SYSTEMTIME st; 345 SYSTEMTIME st;
333 LPCSTR pszDisplay; 346 LPCSTR pszDisplay;
334 CHAR szDisplay[64]; 347 CHAR szDisplay[64];
335 } NMDATETIMEFORMATA, FAR * LPNMDATETIMEFORMATA; 348 } NMDATETIMEFORMATA, FAR * LPNMDATETIMEFORMATA;
336 349
337 typedef struct tagNMDATETIMEFORMATW 350 typedef struct tagNMDATETIMEFORMATW
338 { 351 {
339 NMHDR nmhdr; 352 NMHDR nmhdr;
340 LPCWSTR pszFormat; 353 LPCWSTR pszFormat;
341 SYSTEMTIME st; 354 SYSTEMTIME st;
342 LPCWSTR pszDisplay; 355 LPCWSTR pszDisplay;
343 WCHAR szDisplay[64]; 356 WCHAR szDisplay[64];
344 } NMDATETIMEFORMATW, FAR * LPNMDATETIMEFORMATW; 357 } NMDATETIMEFORMATW, FAR * LPNMDATETIMEFORMATW;
345 358
346 typedef struct tagNMTTDISPIFNOA { 359 typedef struct tagNMTTDISPIFNOA
347 NMHDR hdr; 360 {
348 LPSTR lpszText; 361 NMHDR hdr;
349 char szText[80]; 362 LPSTR lpszText;
350 HINSTANCE hinst; 363 char szText[80];
351 UINT uFlags; 364 HINSTANCE hinst;
365 UINT uFlags;
352 #if (_WIN32_IE >= 0x0300) 366 #if (_WIN32_IE >= 0x0300)
353 LPARAM lParam; 367 LPARAM lParam;
354 #endif 368 #endif
355 } NMTTDISPINFOA, FAR *LPNMTTDISPINFOA; 369 } NMTTDISPINFOA, FAR *LPNMTTDISPINFOA;
356 370
357 typedef struct tagNMTTDISPINFOW { 371 typedef struct tagNMTTDISPINFOW
358 NMHDR hdr; 372 {
359 LPWSTR lpszText; 373 NMHDR hdr;
360 WCHAR szText[80]; 374 LPWSTR lpszText;
361 HINSTANCE hinst; 375 WCHAR szText[80];
362 UINT uFlags; 376 HINSTANCE hinst;
377 UINT uFlags;
363 #if (_WIN32_IE >= 0x0300) 378 #if (_WIN32_IE >= 0x0300)
364 LPARAM lParam; 379 LPARAM lParam;
365 #endif 380 #endif
366 } NMTTDISPINFOW, FAR *LPNMTTDISPINFOW; 381 } NMTTDISPINFOW, FAR *LPNMTTDISPINFOW;
367 382
368 #endif /* (_WIN32_IE >= 0x0400) */ 383 #endif /* (_WIN32_IE >= 0x0400) */
369 384
535 #undef GetEnvironmentStringsA 550 #undef GetEnvironmentStringsA
536 #define GetEnvironmentStringsA GetEnvironmentStrings 551 #define GetEnvironmentStringsA GetEnvironmentStrings
537 Extbyte * qxeGetEnvironmentStrings (void); 552 Extbyte * qxeGetEnvironmentStrings (void);
538 553
539 /* would be encapsulatable but for Cygwin problems */ 554 /* would be encapsulatable but for Cygwin problems */
555
556 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
557 #undef DdeCreateStringHandle
558 #define DdeCreateStringHandle error use qxeDdeCreateStringHandle or DdeCreateStringHandleA/DdeCreateStringHandleW
559 #endif
560 HSZ qxeDdeCreateStringHandle (DWORD idInst, const Extbyte * psz, int iCodePage);
540 561
541 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED 562 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
542 #undef RegConnectRegistry 563 #undef RegConnectRegistry
543 #define RegConnectRegistry error use qxeRegConnectRegistry or RegConnectRegistryA/RegConnectRegistryW 564 #define RegConnectRegistry error use qxeRegConnectRegistry or RegConnectRegistryA/RegConnectRegistryW
544 #endif 565 #endif