[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r8259: Aw, crap. Non-gcc bug. We need regular windows builds. (in tor/trunk: . src/common)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r8259: Aw, crap. Non-gcc bug. We need regular windows builds. (in tor/trunk: . src/common)
- From: nickm@xxxxxxxx
- Date: Sun, 27 Aug 2006 23:46:22 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Sun, 27 Aug 2006 23:46:29 -0400
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: nickm
Date: 2006-08-27 23:46:21 -0400 (Sun, 27 Aug 2006)
New Revision: 8259
Modified:
tor/trunk/
tor/trunk/src/common/compat.h
Log:
r8626@Kushana: nickm | 2006-08-27 23:45:46 -0400
Aw, crap. Non-gcc bug. We need regular windows builds.
Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
- 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8290
1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
96637b51-b116-0410-a10e-9941ebb49b64:/tor/branches/spec:7005
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:8609
c95137ef-5f19-0410-b913-86e773d04f59:/tor/trunk:8576
+ 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8290
1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
96637b51-b116-0410-a10e-9941ebb49b64:/tor/branches/spec:7005
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:8609
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/mmap:7030
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/trans-ap:7315
c95137ef-5f19-0410-b913-86e773d04f59:/tor/trunk:8626
Modified: tor/trunk/src/common/compat.h
===================================================================
--- tor/trunk/src/common/compat.h 2006-08-28 03:29:51 UTC (rev 8258)
+++ tor/trunk/src/common/compat.h 2006-08-28 03:46:21 UTC (rev 8259)
@@ -101,7 +101,7 @@
#define ATTR_PURE
#define ATTR_MALLOC
#define ATTR_NONNULL(x)
-#define PREDICT(exp, val)
+#define PREDICT(exp, val) (exp)
#endif
/* ===== String compatibility */