mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 18:23:07 +00:00
[EXT2FS] Align with upstream and mark ReactOS diff (#5245)
NOTE: There are no new features in this PR, we stay with upstream version 0.69. CORE-18645 - Add ifdefs to distinguish ReactOS code/fixes from the upstream code; - If upstream code was overriden, reintroduce it in #else section; - Re-align .rc version info with upstream (0.69).
This commit is contained in:
parent
39d5f1bf54
commit
aaeb131bd4
21 changed files with 542 additions and 28 deletions
|
@ -59,7 +59,8 @@ extern "C" {
|
|||
#define RtlUlongByteSwap(_x) _byteswap_ulong((_x))
|
||||
#define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x))
|
||||
|
||||
#elif !defined(__REACTOS__)
|
||||
#else
|
||||
#ifndef __REACTOS__
|
||||
|
||||
USHORT
|
||||
FASTCALL
|
||||
|
@ -78,6 +79,7 @@ FASTCALL
|
|||
RtlUlonglongByteSwap(
|
||||
IN ULONGLONG Source
|
||||
);
|
||||
#endif //#ifndef __REACTOS__
|
||||
#endif
|
||||
|
||||
#define __swab16(x) RtlUshortByteSwap(x)
|
||||
|
@ -429,10 +431,18 @@ extern struct task_struct *current;
|
|||
//
|
||||
|
||||
|
||||
#ifdef __REACTOS__
|
||||
static inline int cond_resched() {
|
||||
#else
|
||||
static inline cond_resched() {
|
||||
#endif
|
||||
return FALSE;
|
||||
}
|
||||
#ifdef __REACTOS__
|
||||
static inline int need_resched() {
|
||||
#else
|
||||
static inline need_resched() {
|
||||
#endif
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue