summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-12-29 02:21:02 +0000
committerNick Mathewson <nickm@torproject.org>2008-12-29 02:21:02 +0000
commite8a3fa91a60310559d6ef3eb66663eab4c55b1c1 (patch)
tree17dc47ab473e94d8c4abc9c88a59fff4214d0846 /src/or
parentb0a8ecd19377d13592819b1bc17ea513523b2ed4 (diff)
downloadtor-e8a3fa91a60310559d6ef3eb66663eab4c55b1c1.tar.gz
tor-e8a3fa91a60310559d6ef3eb66663eab4c55b1c1.zip
Use a consistent naming standard for header file guard macros, taking care not to collide with any system headers. This tripped us up on Android.
svn:r17805
Diffstat (limited to 'src/or')
-rw-r--r--src/or/eventdns.h4
-rw-r--r--src/or/or.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/or/eventdns.h b/src/or/eventdns.h
index df5b936923..8d9a0b8fb8 100644
--- a/src/or/eventdns.h
+++ b/src/or/eventdns.h
@@ -209,8 +209,8 @@
* with the next probe.
*/
-#ifndef EVENTDNS_H
-#define EVENTDNS_H
+#ifndef _TOR_EVENTDNS_H
+#define _TOR_EVENTDNS_H
/* Error codes 0-5 are as described in RFC 1035. */
#define DNS_ERR_NONE 0
diff --git a/src/or/or.h b/src/or/or.h
index 139cb133d6..5f21fea88a 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -10,8 +10,8 @@
* \brief Master header file for Tor-specific functionality.
**/
-#ifndef __OR_H
-#define __OR_H
+#ifndef _TOR_OR_H
+#define _TOR_OR_H
#define OR_H_ID "$Id$"
#include "orconfig.h"