[SHELL]

* Mark _ILGetExtension and _ILGetFileType as EXTERN_C.
* __inline before return type.
* Some tiny style consistency fixes.

svn path=/branches/shell-experiments/; revision=65216

diff --git a/dll/win32/shell32/pidl.h b/dll/win32/shell32/pidl.h
index 2def2a8..71fcd5c 100644 (file)
--- a/dll/win32/shell32/pidl.h
+++ b/dll/win32/shell32/pidl.h
@@ -213,8 +213,8 @@ DWORD   _ILSimpleGetText    (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
 DWORD   _ILSimpleGetTextW   (LPCITEMIDLIST pidl, LPWSTR pOut, UINT uOutSize);
 BOOL    _ILGetFileDate      (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
 DWORD   _ILGetFileSize      (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
 DWORD   _ILSimpleGetTextW   (LPCITEMIDLIST pidl, LPWSTR pOut, UINT uOutSize);
 BOOL    _ILGetFileDate      (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
 DWORD   _ILGetFileSize      (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);

-BOOL    _ILGetExtension     (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
-void    _ILGetFileType      (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
+EXTERN_C BOOL    _ILGetExtension     (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
+EXTERN_C void    _ILGetFileType      (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);

 DWORD   _ILGetFileAttributes    (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
 
 BOOL    _ILGetFileDateTime  (LPCITEMIDLIST pidl, FILETIME *ft);
 DWORD   _ILGetFileAttributes    (LPCITEMIDLIST pidl, LPSTR pOut, UINT uOutSize);
 
 BOOL    _ILGetFileDateTime  (LPCITEMIDLIST pidl, FILETIME *ft);


@@ -238,15 +238,14 @@ BOOL    _ILIsValue      (LPCITEMIDLIST pidl);
 BOOL    _ILIsSpecialFolder  (LPCITEMIDLIST pidl);
 BOOL    _ILIsPidlSimple     (LPCITEMIDLIST pidl);
 BOOL    _ILIsCPanelStruct   (LPCITEMIDLIST pidl);
 BOOL    _ILIsSpecialFolder  (LPCITEMIDLIST pidl);
 BOOL    _ILIsPidlSimple     (LPCITEMIDLIST pidl);
 BOOL    _ILIsCPanelStruct   (LPCITEMIDLIST pidl);

-static BOOL __inline _ILIsEqualSimple        (LPCITEMIDLIST pidlA, LPCITEMIDLIST pidlB)
+static __inline
+BOOL    _ILIsEqualSimple        (LPCITEMIDLIST pidlA, LPCITEMIDLIST pidlB)

 {
     return (pidlA->mkid.cb > 0 && !memcmp(pidlA, pidlB, pidlA->mkid.cb)) ||
 {
     return (pidlA->mkid.cb > 0 && !memcmp(pidlA, pidlB, pidlA->mkid.cb)) ||

-           (!pidlA->mkid.cb && !pidlB->mkid.cb);
-}
-static
-BOOL  __inline _ILIsEmpty              (LPCITEMIDLIST pidl) {
-    return _ILIsDesktop(pidl);
+            (!pidlA->mkid.cb && !pidlB->mkid.cb);

 }
 }

+static __inline
+BOOL    _ILIsEmpty              (LPCITEMIDLIST pidl) { return _ILIsDesktop(pidl); }

 
 /*
  * simple pidls
 
 /*
  * simple pidls