aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-12 13:25:17 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-12 13:25:17 -0500
commit2170171d84e30bc4b1b2565255bd978668c50e97 (patch)
tree772928dd947988e5ef8e9dcd11665d3f922d4f3b
parentd85270e13c74bbfb9d2a2f2f7f73736a07b57046 (diff)
parent00f59098767766cc594c89837781c28a1ec67682 (diff)
downloadtor-2170171d84e30bc4b1b2565255bd978668c50e97.tar.gz
tor-2170171d84e30bc4b1b2565255bd978668c50e97.zip
Merge branch 'ticket13172'
-rw-r--r--changes/ticket131724
-rw-r--r--src/common/compat.h9
2 files changed, 13 insertions, 0 deletions
diff --git a/changes/ticket13172 b/changes/ticket13172
new file mode 100644
index 0000000000..a1d47fd9cf
--- /dev/null
+++ b/changes/ticket13172
@@ -0,0 +1,4 @@
+ o Code simplification and refactoring:
+ - Avoid using operators directly as macro arguments: this lets us
+ apply coccinelle transformations to our codebase more
+ directly. Closes ticket 13172. \ No newline at end of file
diff --git a/src/common/compat.h b/src/common/compat.h
index f2eef5b6e7..7001361af3 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -203,6 +203,15 @@ extern INLINE double U64_TO_DBL(uint64_t x) {
#define STMT_END } while (0)
#endif
+/* Some tools (like coccinelle) don't like to see operators as macro
+ * arguments. */
+#define OP_LT <
+#define OP_GT >
+#define OP_GE >=
+#define OP_LE <=
+#define OP_EQ ==
+#define OP_NE !=
+
/* ===== String compatibility */
#ifdef _WIN32
/* Windows names string functions differently from most other platforms. */