From 8176fd7cf3d53dbf4fb99d0d23d3f0ffdddff6f3 Mon Sep 17 00:00:00 2001
From: Walter Bright <walter@walterbright.com>
Date: Wed, 27 Jan 2016 00:50:02 -0800
Subject: [PATCH] remove HIDDENPARAM_1ST_ARG and others

---
 src/backend/cdef.h  | 10 ----------
 src/backend/token.h |  6 ++----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/backend/cdef.h b/src/backend/cdef.h
index 18205b06c99d..854d9ae91437 100644
--- a/src/backend/cdef.h
+++ b/src/backend/cdef.h
@@ -251,19 +251,9 @@ char *strupr(char *);
 // C++ Language Features
 #define ANGLE_BRACKET_HACK      0       // >> means two template arglist closes
 
-// C Language Features
-#define CPP_COMMENT             1       // allow C++ style comments
-
 // C/C++ Language Features
 #define IMPLIED_PRAGMA_ONCE     1       // include guards count as #pragma once
-#define HIDDENPARAM_1ST_ARG     1
 const bool HEADER_LIST          = true;
-#define PASCAL_STRINGS          0
-#define EECONTEXT               1
-#define LOCALE                  0       // locale support for Unicode conversion
-#define OVERLOAD_CV_PARAM       1       // if int foo(int i) and int foo(const int i)
-                                        // are different
-#define CPP0X                   1       // support C++0x features
 
 // Support generating code for 16 bit memory models
 #define SIXTEENBIT              (SCPP && TARGET_WINDOS)
diff --git a/src/backend/token.h b/src/backend/token.h
index 075d28f92bf6..848540c69160 100644
--- a/src/backend/token.h
+++ b/src/backend/token.h
@@ -80,7 +80,7 @@ enum TK {
         TK_Imaginary,
         TKrestrict,
 
-//#if CPP
+        // CPP
         TKbool,
         TKcatch,
         TKclass,
@@ -113,9 +113,8 @@ enum TK {
         TKwchar_t,
         TK_typeinfo,
         TK_typemask,
-//#endif
 
-#if CPP0X
+        // CPP0X
         TKalignof,
         TKchar16_t,
         TKchar32_t,
@@ -125,7 +124,6 @@ enum TK {
         TKnullptr,
         TKstatic_assert,
         TKthread_local,
-#endif
 
         TKasm,
         TK_inf,