compiled/base.h - Issue 29613616: Issue 6064 - Put C++ code into a configurable namespace

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: compiled/base.h

Issue 29613616: Issue 6064 - Put C++ code into a configurable namespace (Closed) Base URL: https://github.com/adblockplus/adblockpluscore.git

Patch Set: rebase Created Feb. 6, 2018, 9:54 a.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: compiled/base.h

diff --git a/compiled/bindings/runtime.h b/compiled/base.h

similarity index 67%

copy from compiled/bindings/runtime.h

copy to compiled/base.h

index 549eeef479e5ace136c078f942008c21b98f1734..2bf8eab304e8c86860c87af6cfddcc857425c69b 100644

--- a/compiled/bindings/runtime.h

+++ b/compiled/base.h

@@ -12,14 +12,16 @@

* GNU General Public License for more details.

* You should have received a copy of the GNU General Public License

- * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

+ * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

#pragma once

-#if defined(__EMSCRIPTEN__)

-#include <emscripten.h>

-#define BINDINGS_EXPORTED EMSCRIPTEN_KEEPALIVE

-#else

-#define BINDINGS_EXPORTED

hub 2018/02/06 14:59:31 Where did these go?

sergei 2018/02/06 15:01:59 base.h is a new file but Rietveld thinks that it's

hub 2018/02/06 15:05:01 ok

+// if a user config is not specified then use the default location.

+#if !defined(ABP_USER_CONFIG)

+# define ABP_USER_CONFIG "user-config.h"

+#endif

+// it should be the first included file

+#ifdef ABP_USER_CONFIG

+#include ABP_USER_CONFIG

#endif