summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-11-10 11:53:41 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-11-10 11:53:41 +0000
commite7e010be584ba7bec9bff6a0ad5b70415dfd9c82 (patch)
tree428f86232ab752e79ed08e630d5d3b435bf9b4c9 /epan
parent8b73d378a46dcf2418f6e1bdda6de070c2a3ad4f (diff)
downloadwireshark-e7e010be584ba7bec9bff6a0ad5b70415dfd9c82.tar.gz
Don't test for guard-include-define (or how it's called) inside including header.
svn path=/trunk/; revision=53220
Diffstat (limited to 'epan')
-rw-r--r--epan/except.h2
-rw-r--r--epan/exceptions.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/epan/except.h b/epan/except.h
index 6dcfb23a49..a9dcfb437c 100644
--- a/epan/except.h
+++ b/epan/except.h
@@ -182,4 +182,4 @@ WS_DLL_PUBLIC void except_free(void *);
except_pop(); \
}
-#endif
+#endif /* XCEPT_H */
diff --git a/epan/exceptions.h b/epan/exceptions.h
index 601206e986..2ddb515357 100644
--- a/epan/exceptions.h
+++ b/epan/exceptions.h
@@ -25,9 +25,7 @@
#ifndef __EXCEPTIONS_H__
#define __EXCEPTIONS_H__
-#ifndef XCEPT_H
#include "except.h"
-#endif
/* Wireshark has only one exception group, to make these macros simple */
#define XCEPT_GROUP_WIRESHARK 1