Skip to content

upstreaming LibreOffice patches #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mistmist wants to merge 2 commits into
base: master
Choose a base branch
from
Open

upstreaming LibreOffice patches #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ec84c3
-Werror,-Wundef (__GNUC__ vs. clang-cl)
stbergmann Aug 29, 2016
781cd9b
Visual Studio 2015 has snprintf
davido Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/librdf.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ extern "C" {
/* Use gcc 3.1+ feature to allow marking of deprecated API calls.
* This gives a warning during compiling.
*/
#if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
#if (defined __GNUC__ && (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)) || defined __clang__
#define REDLAND_DEPRECATED __attribute__((deprecated))
#define REDLAND_NORETURN __attribute__((__noreturn__))
#else
Expand All @@ -83,7 +83,7 @@ extern "C" {
#endif


#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
#if (defined __GNUC__ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4))) || defined __clang__
#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \
__attribute__((__format__(__printf__, string_index, first_to_check_index)))
#else
Expand Down
2 changes: 2 additions & 0 deletions src/win32_rdf_config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ extern "C" {
/* MS names for these functions */
// next line breaks build on wntmsci12
//#define vsnprintf _vsnprintf
#if _MSC_VER < 1900 // older than VC 2015
#define snprintf _snprintf
#endif
#define access _access
#define stricmp _stricmp
#define strnicmp _strnicmp
Expand Down