From bec0b3066c886472f76b04ae3fbd14dd60e2809d Mon Sep 17 00:00:00 2001
From: Daniel Murphy <yebblies@gmail.com>
Date: Thu, 27 Aug 2015 19:20:56 +1000
Subject: [PATCH] Remove some more jupiter references

---
 src/backend/cc.h   | 11 ++++-------
 src/backend/code.h |  2 +-
 src/backend/el.h   |  2 +-
 src/backend/var.c  |  2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/backend/cc.h b/src/backend/cc.h
index 33f44721f122..b31c445b32df 100644
--- a/src/backend/cc.h
+++ b/src/backend/cc.h
@@ -592,14 +592,13 @@ enum BC {
     BCcatch     = 11,   // C++ catch block
     BCjump      = 12,   // Belem specifies (near) address to jump to
     BC_try      = 13,   // SEH: first block of try-except or try-finally
-                        // Jupiter, Mars: try-catch or try-finally
+                        // Mars: try-catch or try-finally
     BC_filter   = 14,   // SEH exception-filter (always exactly one block)
     BC_finally  = 15,   // first block of SEH termination-handler,
                         // or finally block
     BC_ret      = 16,   // last block of SEH termination-handler or finally block
     BC_except   = 17,   // first block of SEH exception-handler
-    BCjcatch    = 18,   // first block of Jupiter or Mars catch-block
-    BCjplace    = 19,   // Jupiter: placeholder
+    BCjcatch    = 18,   // first block of Mars catch-block
     BCMAX
 };
 
@@ -662,10 +661,8 @@ typedef struct FUNC_S
         #define Fnteh           0x08    // uses NT Structured EH
         #define Fdoinline       0x40    // do inline walk
         #define Foverridden     0x80    // ignore for overriding purposes
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_OPENBSD || TARGET_SOLARIS
-        #define Fnowrite        0x100   // SCinline should never output definition
-#else
-        #define Fjmonitor       0x100   // Jupiter synchronized function
+#if MARS && TARGET_WINDOS
+        #define Fjmonitor       0x100   // Mars synchronized function
 #endif
         #define Fnosideeff      0x200   // function has no side effects
         #define F3badoparrow    0x400   // bad operator->()
diff --git a/src/backend/code.h b/src/backend/code.h
index 85fd2d712bdb..28553ce52f76 100644
--- a/src/backend/code.h
+++ b/src/backend/code.h
@@ -167,7 +167,7 @@ extern unsigned usednteh;
 #define NTEHcpp         (NTEHexcspec | NTEHcleanup | NTEHtry)
 #define EHcleanup       0x20
 #define EHtry           0x40
-#define NTEHjmonitor    0x80    // uses Jupiter monitor
+#define NTEHjmonitor    0x80    // uses Mars monitor
 #define NTEHpassthru    0x100
 
 /********************** Code Generator State ***************/
diff --git a/src/backend/el.h b/src/backend/el.h
index 6bf9c89196e2..1bee32081993 100644
--- a/src/backend/el.h
+++ b/src/backend/el.h
@@ -79,7 +79,7 @@ struct elem
                 #define NFLdelcse 0x40  // this is not the generating CSE
                 #define NFLtouns 0x80   // relational operator was changed from signed to unsigned
 #if MARS
-            unsigned char Ejty_;                // original Jupiter/Mars type
+            unsigned char Ejty_;                // original Mars type
             #define Ejty _EU._EO.Ejty_
 #endif
         }_EO;
diff --git a/src/backend/var.c b/src/backend/var.c
index 8e647295389d..605efd1e08b0 100644
--- a/src/backend/var.c
+++ b/src/backend/var.c
@@ -49,7 +49,7 @@ linkage_t linkage;
 int linkage_spec = 0;           /* using the default                    */
 
 /* Function types       */
-/* LINK_MAXDIM = C,C++,Pascal,FORTRAN,syscall,stdcall,Jupiter */
+/* LINK_MAXDIM = C,C++,Pascal,FORTRAN,syscall,stdcall,Mars */
 #if MEMMODELS == 1
 tym_t functypetab[LINK_MAXDIM] =
 {