Index: trunk/Mars/mcore/fits.h
===================================================================
--- trunk/Mars/mcore/fits.h	(revision 15266)
+++ trunk/Mars/mcore/fits.h	(revision 15267)
@@ -26,5 +26,7 @@
 #ifdef __CINT__
 #define off_t size_t
-#else
+#endif
+
+#if !defined(__MARS__) && !defined(__CINT__)
 #include <unordered_map>
 #endif
@@ -46,5 +48,5 @@
 #endif
 
-#ifdef HAVE_ZLIB
+#if defined(HAVE_ZLIB) || defined(__CINT__)
 #include "izstream.h"
 #else
@@ -425,5 +427,5 @@
     Addresses fAddresses;
 
-#ifdef __MARS__
+#if defined(__MARS__) || defined(__CINT__)
     typedef map<string, void*> Pointers;
 #else
@@ -638,5 +640,9 @@
     }
 
+#if !defined(__MARS__) && !defined(__CINT__)
     bool GetRow(size_t row, bool check=true)
+#else
+    bool GetRowNum(size_t row, bool check=true)
+#endif
     {
         if (check && row>=fTable.num_rows)
@@ -657,5 +663,5 @@
 
             // Let the compiler do some optimization by
-            // knowing the we only have 1, 2, 4 and 8
+            // knowing that we only have 1, 2, 4 and 8
             switch (c.size)
             {
@@ -672,5 +678,9 @@
     bool GetNextRow(bool check=true)
     {
+#if !defined(__MARS__) && !defined(__CINT__)
         return GetRow(fRow+1, check);
+#else
+        return GetRowNum(fRow+1, check);
+#endif
     }