mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-08-30 19:29:45 +00:00
Merge pull request #444 from oliverschmidt/master
Changed handling of predefined macros in cc65 allows for simplification.
This commit is contained in:
commit
e5a0f2d663
@ -66,11 +66,11 @@ cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
strncpy(e->name, res->d_name, sizeof(e->name));
|
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;
|
e->size = res->d_blocks;
|
||||||
#else /* __APPLE2__ || __APPLE2ENH__ || __CBM__ */
|
#else /* __APPLE2__ || __CBM__ */
|
||||||
e->size = 0;
|
e->size = 0;
|
||||||
#endif /* __APPLE2__ || __APPLE2ENH__ || __CBM__ */
|
#endif /* __APPLE2__ || __CBM__ */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/*---------------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------------*/
|
||||||
|
Loading…
Reference in New Issue
Block a user