libgrip

Merge lp:~jpakkane/libgrip/underscore_removal into lp:libgrip

  1. underscore_removal
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Merged at revision: 39
Proposed branch: lp:~jpakkane/libgrip/underscore_removal
Merge into: lp:libgrip
Diff against target: 42 lines (+6/-6)
2 files modified
src/gripgesturemanager.h (+3/-3)
src/griptypebuiltins.h.in (+3/-3)
To merge this branch: bzr merge lp:~jpakkane/libgrip/underscore_removal
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+62989@code.launchpad.net

Description of the change

Removed double underscores from inclusion guards, as they are reserved according to C specification.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Yep.

review: Approve
lp:~jpakkane/libgrip/underscore_removal updated
39. By Jussi Pakkanen

Merged underscore removal.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gripgesturemanager.h'
2--- src/gripgesturemanager.h 2011-03-23 15:17:02 +0000
3+++ src/gripgesturemanager.h 2011-05-31 14:06:14 +0000
4@@ -23,8 +23,8 @@
5 * Cody Russell <crussell@canonical.com>
6 */
7
8-#ifndef __GRIP_GESTURE_MANAGER_H__
9-#define __GRIP_GESTURE_MANAGER_H__
10+#ifndef GRIP_GESTURE_MANAGER_H
11+#define GRIP_GESTURE_MANAGER_H
12
13 #include <gtk/gtk.h>
14
15@@ -222,4 +222,4 @@
16
17 G_END_DECLS
18
19-#endif /* __GRIP_GESTURE_MANAGER_H__ */
20+#endif /* GRIP_GESTURE_MANAGER_H */
21
22=== modified file 'src/griptypebuiltins.h.in'
23--- src/griptypebuiltins.h.in 2010-11-22 14:49:44 +0000
24+++ src/griptypebuiltins.h.in 2011-05-31 14:06:14 +0000
25@@ -1,6 +1,6 @@
26 /*** BEGIN file-header ***/
27-#ifndef __GRIP_ENUM_TYPES_H__
28-#define __GRIP_ENUM_TYPES_H__
29+#ifndef GRIP_ENUM_TYPES_H
30+#define GRIP_ENUM_TYPES_H
31
32 #include <glib-object.h>
33
34@@ -15,7 +15,7 @@
35 /*** BEGIN file-tail ***/
36 G_END_DECLS
37
38-#endif /* !__GRIP_ENUM_TYPES_H__ */
39+#endif /* !GRIP_ENUM_TYPES_H */
40 /*** END file-tail ***/
41
42 /*** BEGIN value-header ***/

Subscribers

People subscribed via source and target branches