Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Side by Side Diff: webrtc/libjingle/xmpp/xmppstanzaparser.cc

Issue 1945803003: Revert of Remove the rtc_relative_path GYP variable and similar defines (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/libjingle/xmllite/xmlparser.h ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/libjingle/xmpp/xmppstanzaparser.h" 11 #include "webrtc/libjingle/xmpp/xmppstanzaparser.h"
12 12
13 #include "webrtc/libjingle/xmllite/xmlelement.h" 13 #include "webrtc/libjingle/xmllite/xmlelement.h"
14 #include "webrtc/libjingle/xmpp/constants.h" 14 #include "webrtc/libjingle/xmpp/constants.h"
15 #include "webrtc/base/common.h" 15 #include "webrtc/base/common.h"
16 #ifdef EXPAT_RELATIVE_PATH
16 #include "expat.h" 17 #include "expat.h"
18 #else
19 #include "third_party/expat/v2_0_1/Source/lib/expat.h"
20 #endif
17 21
18 namespace buzz { 22 namespace buzz {
19 23
20 XmppStanzaParser::XmppStanzaParser(XmppStanzaParseHandler *psph) : 24 XmppStanzaParser::XmppStanzaParser(XmppStanzaParseHandler *psph) :
21 psph_(psph), 25 psph_(psph),
22 innerHandler_(this), 26 innerHandler_(this),
23 parser_(&innerHandler_), 27 parser_(&innerHandler_),
24 depth_(0), 28 depth_(0),
25 builder_() { 29 builder_() {
26 } 30 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 80
77 void 81 void
78 XmppStanzaParser::IncomingError( 82 XmppStanzaParser::IncomingError(
79 XmlParseContext * pctx, XML_Error errCode) { 83 XmlParseContext * pctx, XML_Error errCode) {
80 RTC_UNUSED(pctx); 84 RTC_UNUSED(pctx);
81 RTC_UNUSED(errCode); 85 RTC_UNUSED(errCode);
82 psph_->XmlError(); 86 psph_->XmlError();
83 } 87 }
84 88
85 } 89 }
OLDNEW
« no previous file with comments | « webrtc/libjingle/xmllite/xmlparser.h ('k') | webrtc/webrtc_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698