diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-15 11:20:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-15 11:20:48 -0400 |
| commit | 9f83142591dba5460f2cf09e49f716d5c7238f06 (patch) | |
| tree | 558d1d3430532e7eb0b963e6ceba2b9e63d25cfa /src/ext | |
| parent | 469b847c70c7cb801fa806e3336697866c1453d1 (diff) | |
| parent | 30e2d41a650876793b75bef04a2e18cbf5bc3fd6 (diff) | |
| download | tor-9f83142591dba5460f2cf09e49f716d5c7238f06.tar.gz tor-9f83142591dba5460f2cf09e49f716d5c7238f06.zip | |
Merge remote-tracking branch 'public/bug1031'
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/eventdns.h | 4 | ||||
| -rw-r--r-- | src/ext/ht.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ext/eventdns.h b/src/ext/eventdns.h index 1c130b2a12..ad8c100dd6 100644 --- a/src/ext/eventdns.h +++ b/src/ext/eventdns.h @@ -209,8 +209,8 @@ * with the next probe. */ -#ifndef _TOR_EVENTDNS_H -#define _TOR_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/ext/ht.h b/src/ext/ht.h index 25156c4165..385aff2a9b 100644 --- a/src/ext/ht.h +++ b/src/ext/ht.h @@ -5,8 +5,8 @@ /* Based on ideas by Christopher Clark and interfaces from Niels Provos. */ -#ifndef _TOR_HT_H -#define _TOR_HT_H +#ifndef HT_H_INCLUDED_ +#define HT_H_INCLUDED_ #define HT_HEAD(name, type) \ struct name { \ |