-#ifdef ODS_READ_SUPPORT
- if ( s->type == SPREADSHEET_ODS)
- return ods_make_reader (s, opts);
-#endif
-#ifdef GNM_READ_SUPPORT
- if ( s->type == SPREADSHEET_GNUMERIC)
- return gnumeric_make_reader (s, opts);
-#endif
+ if (ODF_READING_SUPPORTED)
+ if ( s->type == SPREADSHEET_ODS)
+ return ods_make_reader (s, opts);
+
+ if (GNM_READING_SUPPORTED)
+ if ( s->type == SPREADSHEET_GNUMERIC)
+ return gnumeric_make_reader (s, opts);