| Index: cpplint.py
|
| ===================================================================
|
| --- cpplint.py (revision 119276)
|
| +++ cpplint.py (working copy)
|
| @@ -1071,12 +1071,18 @@
|
| endif = line
|
| endif_linenum = linenum
|
|
|
| - if not ifndef or not define or ifndef != define:
|
| + if not ifndef:
|
| error(filename, 0, 'build/header_guard', 5,
|
| 'No #ifndef header guard found, suggested CPP variable is: %s' %
|
| cppvar)
|
| return
|
|
|
| + if not define:
|
| + error(filename, 0, 'build/header_guard', 5,
|
| + 'No #define header guard found, suggested CPP variable is: %s' %
|
| + cppvar)
|
| + return
|
| +
|
| # The guard should be PATH_FILE_H_, but we also allow PATH_FILE_H__
|
| # for backward compatibility.
|
| if ifndef != cppvar:
|
| @@ -1089,6 +1095,12 @@
|
| error(filename, ifndef_linenum, 'build/header_guard', error_level,
|
| '#ifndef header guard has wrong style, please use: %s' % cppvar)
|
|
|
| + if define != ifndef:
|
| + error(filename, 0, 'build/header_guard', 5,
|
| + '#ifndef and #define don\'t match, suggested CPP variable is: %s' %
|
| + cppvar)
|
| + return
|
| +
|
| if endif != ('#endif // %s' % cppvar):
|
| error_level = 0
|
| if endif != ('#endif // %s' % (cppvar + '_')):
|
|
|