From 85dfccf0f626741f6e830beea072959a642a2bd6 Mon Sep 17 00:00:00 2001 From: Kurt Jaeger Date: Sat, 30 Apr 2016 04:34:35 +0000 Subject: [PATCH] databases/postgresql-plv8js: Fix build with libc++ 3.8.0 PR: 208526 Submitted by: dim Approved by: vanilla (maintainer) --- .../postgresql-plv8js/files/patch-plv8.cc | 27 +++++++++++++++++++ .../files/patch-plv8_func.cc | 26 ++++++++++++++++++ .../files/patch-plv8_type.cc | 26 ++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 databases/postgresql-plv8js/files/patch-plv8.cc create mode 100644 databases/postgresql-plv8js/files/patch-plv8_func.cc create mode 100644 databases/postgresql-plv8js/files/patch-plv8_type.cc diff --git a/databases/postgresql-plv8js/files/patch-plv8.cc b/databases/postgresql-plv8js/files/patch-plv8.cc new file mode 100644 index 000000000000..f58f12fe420f --- /dev/null +++ b/databases/postgresql-plv8js/files/patch-plv8.cc @@ -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 + + 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); diff --git a/databases/postgresql-plv8js/files/patch-plv8_func.cc b/databases/postgresql-plv8js/files/patch-plv8_func.cc new file mode 100644 index 000000000000..656f27398989 --- /dev/null +++ b/databases/postgresql-plv8js/files/patch-plv8_func.cc @@ -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 + + 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; diff --git a/databases/postgresql-plv8js/files/patch-plv8_type.cc b/databases/postgresql-plv8js/files/patch-plv8_type.cc new file mode 100644 index 000000000000..e1713d73e77b --- /dev/null +++ b/databases/postgresql-plv8js/files/patch-plv8_type.cc @@ -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