Changeset 06adc25

Timestamp:

Aug 21, 2010, 3:19:22 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

691d012

Parents:

86f740e

git-author:

David Benjamin <davidben@mit.edu> (08/07/10 19:16:55)

git-committer:

David Benjamin <davidben@mit.edu> (08/21/10 15:19:22)

Message:

Sanitize our include guards somewhat

Avoid double underscores to avoid clashing with reserved symbols. Also
adding BARNOWL to guard names. While I'm at it, owl_prototypes.h could
use guards.

Files:

• codelist.pl (modified) (2 diffs)
• filterproc.h (modified) (2 diffs)
• owl.h (modified) (2 diffs)
• owl_perl.h (modified) (2 diffs)
• window.h (modified) (2 diffs)

codelist.pl

@@ -1 +1 @@
 #! /usr/bin/perl
 
+my $guard_symbol = "INC_BARNOWL_OWL_PROTOTYPES_H";
+print "#ifndef $guard_symbol\n";
+print "#define $guard_symbol\n";
 foreach $file (@ARGV) {
     open(FILE, $file);
@@ -31 +34 @@
     print "\n";
 }
-
-
+print "#endif /* $guard_symbol */\n";

filterproc.h

@@ -1 @@
-#ifndef __FILTER_PROC_H__
-#define __FILTER_PROC_H__
+#ifndef INC_BARNOWL_FILTER_PROC_H
+#define INC_BARNOWL_FILTER_PROC_H
 
 int call_filter(const char *prog,
@@ -7 +7 @@
                 char **out, int *status);
 
-#endif
+#endif /* INC_BARNOWL_FILTER_PROC_H */

owl.h

@@ -7 +7 @@
  */
 
-#ifndef INC_OWL_H
-#define INC_OWL_H
+#ifndef INC_BARNOWL_OWL_H
+#define INC_BARNOWL_OWL_H
 
 #ifdef HAVE_STDBOOL_H
@@ -648 +648 @@
 #endif
 
-#endif /* INC_OWL_H */
+#endif /* INC_BARNOWL_OWL_H */

owl_perl.h

@@ -1 @@
-#ifndef INC_OWL_PERL_H
-#define INC_OWL_PERL_H
+#ifndef INC_BARNOWL_OWL_PERL_H
+#define INC_BARNOWL_OWL_PERL_H
 
 #define OWL_PERL_VOID_CALL (void)POPs;
@@ -53 +53 @@
 }
 
-#endif /* INC_PERL_PERL_H */
+#endif /* INC_BARNOWL_OWL_PERL_H */

window.h

@@ -1 @@
-#ifndef __BARNOWL_WINDOW_H__
-#define __BARNOWL_WINDOW_H__
+#ifndef INC_BARNOWL_WINDOW_H
+#define INC_BARNOWL_WINDOW_H
 
 #include <glib.h>
@@ -67 +67 @@
 G_END_DECLS
 
-#endif /* __BARNOWL_WINDOW_H__ */
+#endif /* INC_BARNOWL_WINDOW_H */