sal/osl/w32/dllentry.c | 2 +- sal/osl/w32/file_dirvol.cxx | 6 ------ sal/osl/w32/socket.cxx | 4 +++- sal/systools/win32/uwinapi/legacy.c | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-)
New commits: commit 2f59f936fe521cf078aad88149d1f133cfd3deed Author: Stephan Bergmann <[email protected]> Date: Wed Nov 11 16:01:02 2015 +0100 -Werror,-Wunused-function Change-Id: Ic12b2914b4f39a96d1455dc280c97d64639b9849 diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 636bfce..927da21 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -714,6 +714,7 @@ struct oslHostAddrImpl { oslSocketAddr pSockAddr; } ; +#if _WIN32_WINNT < _WIN32_WINNT_VISTA static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he) { oslHostAddr pAddr= NULL; @@ -773,6 +774,7 @@ static oslHostAddr __osl_hostentToHostAddr (const struct hostent *he) return pAddr; } +#endif /*****************************************************************************/ /* osl_createHostAddr */ commit bf35ea1dea48cfc5617e116c1f638f787f349855 Author: Stephan Bergmann <[email protected]> Date: Wed Nov 11 15:58:21 2015 +0100 -Werror,-Wextern-initializer Change-Id: I334c0a5004fa417f1cb3b1e768988644c712be7f diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c index 95b805f..c6e4fb6 100644 --- a/sal/osl/w32/dllentry.c +++ b/sal/osl/w32/dllentry.c @@ -70,7 +70,7 @@ _pRawDllMain() */ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ); -extern BOOL (WINAPI *_pRawDllMain)(HINSTANCE, DWORD, LPVOID) = _RawDllMain; +BOOL (WINAPI *_pRawDllMain)(HINSTANCE, DWORD, LPVOID) = _RawDllMain; #endif commit a5ead0559d5b920db7ab9638f60d79c7f87c07c5 Author: Stephan Bergmann <[email protected]> Date: Wed Nov 11 15:56:52 2015 +0100 -Werror,-Wincompatible-pointer-types Change-Id: If126707fe637917a5f73950c751a97c30ad2e692 diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c index 1a113b3..95b805f 100644 --- a/sal/osl/w32/dllentry.c +++ b/sal/osl/w32/dllentry.c @@ -70,7 +70,7 @@ _pRawDllMain() */ static BOOL WINAPI _RawDllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ); -extern BOOL (WINAPI *_pRawDllMain)(HANDLE, DWORD, LPVOID) = _RawDllMain; +extern BOOL (WINAPI *_pRawDllMain)(HINSTANCE, DWORD, LPVOID) = _RawDllMain; #endif commit 97b201f6ba667fdf4ff19bcc73bbbbf51f567a68 Author: Stephan Bergmann <[email protected]> Date: Wed Nov 11 15:49:26 2015 +0100 -Werror,-Wparentheses-equality Change-Id: I1c85127f02697d39f17d4d5f52cb997352886701 diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index 0b98b3f..636bfce 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -1092,7 +1092,7 @@ sal_Int32 SAL_CALL osl_getInetPortOfSocketAddr(oslSocketAddr pAddr) { struct sockaddr_in* pSystemInetAddr= (struct sockaddr_in*)&(pAddr->m_sockaddr); - if ( (pSystemInetAddr->sin_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet))) + if (pSystemInetAddr->sin_family == FAMILY_TO_NATIVE(osl_Socket_FamilyInet)) return ntohs(pSystemInetAddr->sin_port); } return OSL_INVALID_PORT; commit 1be1e02d9af02e5ff47725eff65e4cbae96f7083 Author: Stephan Bergmann <[email protected]> Date: Wed Nov 11 15:46:10 2015 +0100 -Werror,-Wunused-function Change-Id: I7fd09e4595be82ebd292042b09cc4c3e96b59d66 diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index e0ca799..04a62d1 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -131,9 +131,6 @@ namespace /* private */ inline bool is_UNC_path(const sal_Unicode* path) { return (0 == wcsncmp(UNC_PREFIX, path, SAL_N_ELEMENTS(UNC_PREFIX) - 1)); } - inline bool is_UNC_path(const rtl::OUString& path) - { return is_UNC_path(path.getStr()); } - void parse_UNC_path(const sal_Unicode* path, UNCComponents* puncc) { OSL_PRECOND(is_UNC_path(path), "Precondition violated: No UNC path"); @@ -171,9 +168,6 @@ namespace /* private */ "Postcondition violated: Invalid UNC path detected"); } - void parse_UNC_path(const rtl::OUString& path, UNCComponents* puncc) - { parse_UNC_path(path.getStr(), puncc); } - bool has_path_parent(const sal_Unicode* path) { // Has the given path a parent or are we already there, commit 203595a1b5b9f9ad02ee6fa7008dae17459a6315 Author: Stephan Bergmann <[email protected]> Date: Wed Nov 11 15:32:19 2015 +0100 -Werror,-Winconsistent-dllimport > sal/systools/win32/uwinapi/legacy.c(21,14) : error: 'GetShortPathNameW' redeclared without 'dllimport' attribute: previous 'dllimport' ignored [-Werror,-Winconsistent-dllimport] > DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR lpszShortPath,DWORD cchBuffer) > ^ > C:/PROGRA~2/WI3CF2~1/8.1/include/um\fileapi.h(780,1) : note: previous declaration is here > GetShortPathNameW( > ^ > C:/PROGRA~2/WI3CF2~1/8.1/include/um\fileapi.h(776,1) : note: previous attribute is here > WINBASEAPI > ^ > C:/PROGRA~2/WI3CF2~1/8.1/include/shared\apisetcconv.h(22,20) : note: expanded from macro 'WINBASEAPI' > #define WINBASEAPI DECLSPEC_IMPORT > ^ > C:/PROGRA~2/WI3CF2~1/8.1/include/um\winnt.h(175,36) : note: expanded from macro 'DECLSPEC_IMPORT' > #define DECLSPEC_IMPORT __declspec(dllimport) > ^ Change-Id: Ifb0d3179bca9da192afc0af4e731a799f6d392b2 diff --git a/sal/systools/win32/uwinapi/legacy.c b/sal/systools/win32/uwinapi/legacy.c index c2ca560..e88c752 100644 --- a/sal/systools/win32/uwinapi/legacy.c +++ b/sal/systools/win32/uwinapi/legacy.c @@ -14,7 +14,7 @@ #pragma warning(disable:4273) // inconsistent dll linkage #endif -#if defined(_MSC_VER) && (_MSC_VER >= 1900) +#if (defined(_MSC_VER) && (_MSC_VER >= 1900)) || defined __clang__ // older versions use uwinapi.def file for export __declspec(dllexport) #endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
