[grisbi-cvs] grisbi/win32 win32utils.h,1.13,1.14
Mickaƫl Remars
mykeul at users.sourceforge.net
Sun Aug 23 23:56:55 CEST 2009
Update of /cvsroot/grisbi/grisbi/win32
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12043
Modified Files:
win32utils.h
Log Message:
* do not #define GetLongPathName when compiling with msvc (already defined)
Index: win32utils.h
===================================================================
RCS file: /cvsroot/grisbi/grisbi/win32/win32utils.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- win32utils.h 22 Dec 2008 18:43:25 -0000 1.13
+++ win32utils.h 23 Aug 2009 21:56:53 -0000 1.14
@@ -112,15 +112,18 @@
typedef HRESULT (__stdcall * PFNSHGETGETLONGPATHNAMEA)(LPCTSTR, LPTSTR, DWORD); // "GetLongPathNameA"
typedef HRESULT (__stdcall * PFNSHGETGETLONGPATHNAMEW)(LPCTSTR, LPTSTR, DWORD); // "GetLongPathNameW"
+#ifndef _MSC_VER
#ifdef UNICODE
#define GetLongPathName GetLongPathNameA
#define SZ_GETLONGPATHNAME "GetLongPathNameA"
#define PFNGETLONGPATHNAME PFNSHGETGETLONGPATHNAMEA
-#else
+#else//UNICODE
#define GetLongPathName GetLongPathNameW
#define SZ_GETLONGPATHNAME "GetLongPathNameW"
#define PFNGETLONGPATHNAME PFNSHGETGETLONGPATHNAMEW
-#endif
+#endif//UNICODE
+#endif//_MSC_VER
+
//DWORD win32_get_long_path_name(LPCTSTR lpszShortPath, LPTSTR lpszLongPath, DWORD ccBuffer);
gchar* win32_long_name(gchar*);
gchar* win32_full_path(gchar*);
More information about the cvs
mailing list