浏览代码

Update gisinit.c

re-enable the version check, it is there for a reason. TODO: adapt GIS_H_VERSION for git.
The version check is working for C modules, please fix ctypes if there are problems.
Markus Metz 5 年之前
父节点
当前提交
6617ffb4ed
共有 1 个文件被更改,包括 1 次插入5 次删除
  1. 1 5
      lib/gis/gisinit.c

+ 1 - 5
lib/gis/gisinit.c

@@ -49,14 +49,12 @@ void G__gisinit(const char *version, const char *pgm)
 
 
     G_set_program_name(pgm);
     G_set_program_name(pgm);
 
 
-    /* temporary disabled since svn keywords are not maintained by git
     if (strcmp(version, GIS_H_VERSION) != 0)
     if (strcmp(version, GIS_H_VERSION) != 0)
 	G_fatal_error(_("Module built against version %s but "
 	G_fatal_error(_("Module built against version %s but "
 			"trying to use version %s. "
 			"trying to use version %s. "
 			"You need to rebuild GRASS GIS or untangle multiple installations."),
 			"You need to rebuild GRASS GIS or untangle multiple installations."),
                         version, GIS_H_VERSION);
                         version, GIS_H_VERSION);
-    */
-
+    
     /* Make sure location and mapset are set */
     /* Make sure location and mapset are set */
     G_location_path();
     G_location_path();
     mapset = G_mapset();
     mapset = G_mapset();
@@ -85,13 +83,11 @@ void G__no_gisinit(const char *version)
     if (initialized)
     if (initialized)
 	return;
 	return;
 
 
-    /* temporary disabled since svn keywords are not maintained by git
     if (strcmp(version, GIS_H_VERSION) != 0)
     if (strcmp(version, GIS_H_VERSION) != 0)
 	G_fatal_error(_("Module built against version %s but "
 	G_fatal_error(_("Module built against version %s but "
 			"trying to use version %s. "
 			"trying to use version %s. "
 			"You need to rebuild GRASS GIS or untangle multiple installations."),
 			"You need to rebuild GRASS GIS or untangle multiple installations."),
                         version, GIS_H_VERSION);
                         version, GIS_H_VERSION);
-    */
     gisinit();
     gisinit();
 }
 }