mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 15:06:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Compile with GCC 5

Browse source 
this fixes the error and makes complete oCC compile with GCC 5.
error: ISO C does not support '__FUNCTION__' predefined identifier
[-Wpedantic]

According to the porting guide:
The fix is either to use the standard predefined identifier __func__
(since C99), or to use the __extension__ keyword.
This commit is contained in:
Hefee 2015-05-07 01:15:55 +02:00
parent 9ef8658122
commit 23b6426dfa
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
csync/src/csync_log.h
View file

@ -61,7 +61,7 @@ enum csync_log_priority_e {
}; };
#define CSYNC_LOG(priority, ...) \ #define CSYNC_LOG(priority, ...) \
csync_log(priority, __FUNCTION__, __VA_ARGS__) csync_log(priority, __func__, __VA_ARGS__)
void csync_log(int verbosity, void csync_log(int verbosity,
const char *function, const char *function,

2
csync/src/httpbf/src/httpbf.c
View file

@ -42,7 +42,7 @@
#define DEBUG_HBF(...) { if(transfer->log_cb) { \ #define DEBUG_HBF(...) { if(transfer->log_cb) { \
char buf[1024]; \ char buf[1024]; \
snprintf(buf, 1024, __VA_ARGS__); \ snprintf(buf, 1024, __VA_ARGS__); \
transfer->log_cb(__FUNCTION__, buf, transfer->user_data); \ transfer->log_cb(__func__, buf, transfer->user_data); \
} } } }
// #endif // #endif

2
csync/tests/csync_tests/check_csync_log.c
View file

@ -131,7 +131,7 @@ static void check_logging(void **state)
rc = csync_set_log_callback(check_log_callback); rc = csync_set_log_callback(check_log_callback);
assert_int_equal(rc, 0); assert_int_equal(rc, 0);
csync_log(1, __FUNCTION__, "rc = %d", rc); csync_log(1, __func__, "rc = %d", rc);
rc = _tstat(path, &sb); rc = _tstat(path, &sb);