Merge pull request #444 from oliverschmidt/master

Changed handling of predefined macros in cc65 allows for simplification.
This commit is contained in:
Oliver Schmidt 2013-11-20 11:59:55 -08:00
commit e5a0f2d663

View File

@ -66,11 +66,11 @@ cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
return -1;
}
strncpy(e->name, res->d_name, sizeof(e->name));
#if defined(__APPLE2__) || defined(__APPLE2ENH__) || defined(__CBM__)
#if defined(__APPLE2__) || defined(__CBM__)
e->size = res->d_blocks;
#else /* __APPLE2__ || __APPLE2ENH__ || __CBM__ */
#else /* __APPLE2__ || __CBM__ */
e->size = 0;
#endif /* __APPLE2__ || __APPLE2ENH__ || __CBM__ */
#endif /* __APPLE2__ || __CBM__ */
return 0;
}
/*---------------------------------------------------------------------------*/