Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/syswindows.h	Sat Dec 26 00:20:27 2009 -0600
+++ b/src/syswindows.h	Sat Dec 26 21:18:49 2009 -0600
@@ -88,6 +88,8 @@
 #define OEMRESOURCE /* Define OCR_ and friend constants */
 #include <windows.h>
 
+#include <aclapi.h>
+
 #if defined (WIN32_LEAN_AND_MEAN)
 # ifdef HAVE_X_WINDOWS
 /* Christ almighty.  The problems you get when combining two large code bases,
@@ -477,7 +479,7 @@
 #define BIF_NEWDIALOGSTYLE 64
 #endif
 
-#ifdef CYGWIN
+#if defined (CYGWIN) && (CYGWIN_VERSION_DLL_COMBINED < 190)
 
 /* All but wcscmp and wcslen left out of Cygwin headers -- but present
    in /usr/include/mingw/string.h! */
@@ -932,6 +934,7 @@
 int cygwin_win32_to_posix_path_list_buf_size (const char *);
 void cygwin_posix_to_win32_path_list (const char *, char *);
 int cygwin_posix_to_win32_path_list_buf_size (const char *);
+extern int cygwin_conv_to_full_win32_path (const char *, char *);
 
 END_C_DECLS