--- databases/postgresql-plv8js/files/patch-plv8.cc	(nonexistent)
+++ databases/postgresql-plv8js/files/patch-plv8.cc	(working copy)
@@ -0,0 +1,27 @@ 
+--- plv8.cc.orig	2015-05-26 19:46:56.000000000 +0200
++++ plv8.cc	2016-04-04 17:11:11.340628000 +0200
+@@ -9,11 +9,6 @@
+ #include <new>
+ 
+ extern "C" {
+-#define delete		delete_
+-#define namespace	namespace_
+-#define	typeid		typeid_
+-#define	typename	typename_
+-#define	using		using_
+ 
+ #if PG_VERSION_NUM >= 90300
+ #include "access/htup_details.h"
+@@ -32,12 +27,6 @@ extern "C" {
+ #include "utils/rel.h"
+ #include "utils/syscache.h"
+ 
+-#undef delete
+-#undef namespace
+-#undef typeid
+-#undef typename
+-#undef using
+-
+ PG_MODULE_MAGIC;
+ 
+ PG_FUNCTION_INFO_V1(plv8_call_handler);
--- databases/postgresql-plv8js/files/patch-plv8_func.cc	(nonexistent)
+++ databases/postgresql-plv8js/files/patch-plv8_func.cc	(working copy)
@@ -0,0 +1,26 @@ 
+--- plv8_func.cc.orig	2015-05-26 19:46:56.000000000 +0200
++++ plv8_func.cc	2016-04-04 17:11:11.341047000 +0200
+@@ -10,11 +10,6 @@
+ #include <sstream>
+ 
+ extern "C" {
+-#define delete		delete_
+-#define namespace	namespace_
+-#define	typeid		typeid_
+-#define	typename	typename_
+-#define	using		using_
+ 
+ #include "access/xact.h"
+ #include "catalog/pg_type.h"
+@@ -23,11 +18,6 @@ extern "C" {
+ #include "utils/builtins.h"
+ #include "utils/lsyscache.h"
+ 
+-#undef delete
+-#undef namespace
+-#undef typeid
+-#undef typename
+-#undef using
+ } // extern "C"
+ 
+ using namespace v8;
--- databases/postgresql-plv8js/files/patch-plv8_type.cc	(nonexistent)
+++ databases/postgresql-plv8js/files/patch-plv8_type.cc	(working copy)
@@ -0,0 +1,26 @@ 
+--- plv8_type.cc.orig	2015-05-26 19:46:56.000000000 +0200
++++ plv8_type.cc	2016-04-04 17:11:11.341361000 +0200
+@@ -8,11 +8,6 @@
+ #include "plv8.h"
+ 
+ extern "C" {
+-#define delete		delete_
+-#define namespace	namespace_
+-#define	typeid		typeid_
+-#define	typename	typename_
+-#define	using		using_
+ 
+ #if PG_VERSION_NUM >= 90300
+ #include "access/htup_details.h"
+@@ -29,11 +24,6 @@ extern "C" {
+ #include "utils/syscache.h"
+ #include "utils/typcache.h"
+ 
+-#undef delete
+-#undef namespace
+-#undef typeid
+-#undef typename
+-#undef using
+ } // extern "C"
+ 
+ //#define CHECK_INTEGER_OVERFLOW