[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Workaround for brain-damaged __FILE__ handling on MSVC: kee...
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] Workaround for brain-damaged __FILE__ handling on MSVC: kee...
- From: nickm@xxxxxxxx (Nick Mathewson)
- Date: Tue, 21 Dec 2004 21:32:28 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Tue, 21 Dec 2004 21:32:57 -0500
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv32305/src/or
Modified Files:
or.h
Log Message:
Workaround for brain-damaged __FILE__ handling on MSVC: keep Nick's name out
of the warning messages.
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -d -r1.508 -r1.509
--- or.h 13 Dec 2004 18:32:29 -0000 1.508
+++ or.h 22 Dec 2004 02:32:26 -0000 1.509
@@ -1070,9 +1070,10 @@
do { \
if (_circuit_mark_for_close(c)<0) { \
log(LOG_WARN,"Duplicate call to circuit_mark_for_close at %s:%d (first at %s:%d)", \
- __FILE__,__LINE__,c->marked_for_close_file,c->marked_for_close); \
+ _SHORT_FILE_,__LINE__, \
+ c->marked_for_close_file,c->marked_for_close); \
} else { \
- c->marked_for_close_file = __FILE__; \
+ c->marked_for_close_file = _SHORT_FILE_; \
c->marked_for_close = __LINE__; \
} \
} while (0)
@@ -1154,9 +1155,10 @@
do { \
if (_connection_mark_for_close(c)<0) { \
log(LOG_WARN,"Duplicate call to connection_mark_for_close at %s:%d (first at %s:%d)", \
- __FILE__,__LINE__,c->marked_for_close_file,c->marked_for_close); \
+ _SHORT_FILE_,__LINE__, \
+ c->marked_for_close_file,c->marked_for_close); \
} else { \
- c->marked_for_close_file = __FILE__; \
+ c->marked_for_close_file = _SHORT_FILE_; \
c->marked_for_close = __LINE__; \
} \
} while (0)