comparison src/syswindows.h @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 112f6ed44299
children c12b646d84ee
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
86 #endif 86 #endif
87 87
88 #define OEMRESOURCE /* Define OCR_ and friend constants */ 88 #define OEMRESOURCE /* Define OCR_ and friend constants */
89 #include <windows.h> 89 #include <windows.h>
90 90
91 #include <aclapi.h>
92
91 #if defined (WIN32_LEAN_AND_MEAN) 93 #if defined (WIN32_LEAN_AND_MEAN)
92 # ifdef HAVE_X_WINDOWS 94 # ifdef HAVE_X_WINDOWS
93 /* Christ almighty. The problems you get when combining two large code bases, 95 /* Christ almighty. The problems you get when combining two large code bases,
94 neither with any respect for namespace purity. */ 96 neither with any respect for namespace purity. */
95 # undef Status 97 # undef Status
475 /* Not in VC 6 */ 477 /* Not in VC 6 */
476 #ifndef BIF_NEWDIALOGSTYLE 478 #ifndef BIF_NEWDIALOGSTYLE
477 #define BIF_NEWDIALOGSTYLE 64 479 #define BIF_NEWDIALOGSTYLE 64
478 #endif 480 #endif
479 481
480 #ifdef CYGWIN 482 #if defined (CYGWIN) && (CYGWIN_VERSION_DLL_COMBINED < 190)
481 483
482 /* All but wcscmp and wcslen left out of Cygwin headers -- but present 484 /* All but wcscmp and wcslen left out of Cygwin headers -- but present
483 in /usr/include/mingw/string.h! */ 485 in /usr/include/mingw/string.h! */
484 wchar_t* wcscat (wchar_t*, const wchar_t*); 486 wchar_t* wcscat (wchar_t*, const wchar_t*);
485 wchar_t* wcschr (const wchar_t*, wchar_t); 487 wchar_t* wcschr (const wchar_t*, wchar_t);
930 932
931 void cygwin_win32_to_posix_path_list (const char *, char *); 933 void cygwin_win32_to_posix_path_list (const char *, char *);
932 int cygwin_win32_to_posix_path_list_buf_size (const char *); 934 int cygwin_win32_to_posix_path_list_buf_size (const char *);
933 void cygwin_posix_to_win32_path_list (const char *, char *); 935 void cygwin_posix_to_win32_path_list (const char *, char *);
934 int cygwin_posix_to_win32_path_list_buf_size (const char *); 936 int cygwin_posix_to_win32_path_list_buf_size (const char *);
937 extern int cygwin_conv_to_full_win32_path (const char *, char *);
935 938
936 END_C_DECLS 939 END_C_DECLS
937 940
938 #endif 941 #endif
939 942