ext/RMagick/rmmain.c in rmagick-4.1.2 vs ext/RMagick/rmmain.c in rmagick-4.2.0

@@ -240,10 +240,12 @@
 
     MagickCoreGenesis("RMagick", MagickFalse);
 
     test_Magick_version();
 
+    rm_main_thread_id = rm_current_thread_id();
+
     /*-----------------------------------------------------------------------*/
     /* Create IDs for frequently used methods, etc.                          */
     /*-----------------------------------------------------------------------*/
 
     rm_ID_trace_proc       = rb_intern("@trace_proc");
@@ -1129,10 +1131,20 @@
         ENUMERATOR(HSVColorspace)
         ENUMERATOR(HCLpColorspace)
         ENUMERATOR(YDbDrColorspace)
         ENUMERATORV(XyYColorspace, xyYColorspace)
 #endif
+#if defined(IMAGEMAGICK_7)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_0_8)
+        ENUMERATOR(LinearGRAYColorspace)
+#endif
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_0_10)
+        ENUMERATOR(JzazbzColorspace)
+#endif
+#elif defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_9_10)
+        ENUMERATOR(LinearGRAYColorspace)
+#endif
     END_ENUM
 
     // ComplianceType constants are defined as enums but used as bit flags
     DEF_ENUM(ComplianceType)
         ENUMERATOR(UndefinedCompliance)
@@ -1868,10 +1880,11 @@
                 break;
             }
         }
 
         rb_raise(rb_eRuntimeError,
-                 "This installation of RMagick was configured with %s %s but %.*s is in use.\n" ,
+                 "This installation of RMagick was configured with %s %s but %.*s is in use.\n"
+                 "Please re-install RMagick to correct the issue.\n",
                  MagickPackageName, MagickLibVersionText, x, version_str);
     }
 
 }