summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorjeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 18:27:19 +0000
committerjeanluc@chromium.org <jeanluc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 18:27:19 +0000
commit433d969a9d5631ac3579e740f51e8e4c31667b2b (patch)
tree11b7479df6d353cce7ad68dc7ce521c226a9bb85 /chrome_frame
parent91243c39265d425a01aae6668fe7896598f566e0 (diff)
downloadchromium_src-433d969a9d5631ac3579e740f51e8e4c31667b2b.zip
chromium_src-433d969a9d5631ac3579e740f51e8e4c31667b2b.tar.gz
chromium_src-433d969a9d5631ac3579e740f51e8e4c31667b2b.tar.bz2
MASM 10.0 fixes a problem introduced in 8.0 with extra underscore added.
BUG=71145 TEST=Compile & link cleanly Review URL: http://codereview.chromium.org/6352023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/exception_barrier_lowlevel.asm3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/exception_barrier_lowlevel.asm b/chrome_frame/exception_barrier_lowlevel.asm
index f8f652f..949195d 100644
--- a/chrome_frame/exception_barrier_lowlevel.asm
+++ b/chrome_frame/exception_barrier_lowlevel.asm
@@ -7,7 +7,8 @@
;
; MASM 8.0 inserts an additional leading underscore in front of names
; and this is an attempted fix until we understand why.
-IF @version LT 800
+; MASM 10.0 fixed this.
+IF @version LT 800 OR @version GE 1000
_ExceptionBarrierHandler PROTO
.SAFESEH _ExceptionBarrierHandler
_ExceptionBarrierReportOnlyModuleHandler PROTO