|
@@ -1006,7 +1006,11 @@ int main(int argc, char *argv[])
|
|
|
/* check if the field is integer */
|
|
|
Ogr_field = OGR_FD_GetFieldDefn(Ogr_featuredefn, key_idx);
|
|
|
Ogr_ftype = OGR_Fld_GetType(Ogr_field);
|
|
|
- if (!(Ogr_ftype == OFTInteger || Ogr_ftype == OFTInteger64)) {
|
|
|
+ if (!(Ogr_ftype == OFTInteger
|
|
|
+#if GDAL_VERSION_NUM >= 2000000
|
|
|
+ || Ogr_ftype == OFTInteger64
|
|
|
+#endif
|
|
|
+ )) {
|
|
|
G_fatal_error(_("Key column '%s' is not integer"), param.key->answer);
|
|
|
}
|
|
|
key_column = G_store(OGR_Fld_GetNameRef(Ogr_field));
|
|
@@ -1282,7 +1286,11 @@ int main(int argc, char *argv[])
|
|
|
}
|
|
|
else {
|
|
|
/* G_warning (_("Column value not set" )); */
|
|
|
- if (Ogr_ftype == OFTInteger || Ogr_ftype == OFTInteger64 ||Ogr_ftype == OFTReal) {
|
|
|
+ if (Ogr_ftype == OFTInteger ||
|
|
|
+#if GDAL_VERSION_NUM >= 2000000
|
|
|
+ Ogr_ftype == OFTInteger64 ||
|
|
|
+#endif
|
|
|
+ Ogr_ftype == OFTReal) {
|
|
|
sprintf(buf, ", NULL");
|
|
|
}
|
|
|
#if GDAL_VERSION_NUM >= 1320
|