Geis

Merge lp:~ken-vandine/geis/lp1428314 into lp:geis

  1. lp1428314
  2. Merge into trunk
Proposed by Ken VanDine on 2015-03-04
Status: Merged
Approved by: Stephen M. Webb on 2015-03-04
Approved revision: 328
Merged at revision: 328
Proposed branch: lp:~ken-vandine/geis/lp1428314
Merge into: lp:geis
Diff against target: 20 lines (+3/-3)
1 file modified
libs/geis-util/geis_logging.h (+3/-3)
To merge this branch: bzr merge lp:~ken-vandine/geis/lp1428314
Reviewer Review Type Date Requested Status
Open Input Framework Team 2015-03-04 Pending
Review via email: mp+251828@code.launchpad.net

Commit Message

  * Fix build error with GCC 5, patch thanks to Matthias Klose

Description of the Change

  * Fix build error with GCC 5, patch thanks to Matthias Klose

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libs/geis-util/geis_logging.h'
2--- libs/geis-util/geis_logging.h 2012-12-04 12:39:16 +0000
3+++ libs/geis-util/geis_logging.h 2015-03-04 21:04:49 +0000
4@@ -47,13 +47,13 @@
5 * @param[in] fmt printf-style format string
6 */
7 #define geis_debug(...) _geis_message(_GEIS_LOG_LEVEL_DEBUG, \
8- __FUNCTION__, __LINE__, \
9+ __extension__ __FUNCTION__, __LINE__, \
10 __VA_ARGS__)
11 #define geis_warning(...) _geis_message(_GEIS_LOG_LEVEL_WARNING, \
12- __FUNCTION__, __LINE__, \
13+ __extension__ __FUNCTION__, __LINE__, \
14 __VA_ARGS__)
15 #define geis_error(...) _geis_message(_GEIS_LOG_LEVEL_ERROR, \
16- __FUNCTION__, __LINE__, \
17+ __extension__ __FUNCTION__, __LINE__, \
18 __VA_ARGS__)
19 int _geis_message(int level,
20 const char *function, int line,

Subscribers

People subscribed via source and target branches