Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

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 Dec. 12, 2017, 12:45 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « compiled/StringScanner.h ('k') | compiled/bindings/generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
+// 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
« no previous file with comments | « compiled/StringScanner.h ('k') | compiled/bindings/generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld