Merged revisions 7972,7974 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r7972 | Almindor | 2007-07-07 10:41:42 +0200 (Sat, 07 Jul 2007) | 2 lines

* make FUTEX_OP implemented also with FPC_USE_LIBC since it's a macro

........
r7974 | Almindor | 2007-07-07 11:23:18 +0200 (Sat, 07 Jul 2007) | 2 lines

* move the FUTEX down so uses doesn't get in the way

........

git-svn-id: branches/fixes_2_2@8088 -

rtl/linux/linux.pp

@@ -287,11 +287,6 @@ begin
 {$endif cpum68k}
 end;
 
-function FUTEX_OP(op, oparg, cmp, cmparg: cint): cint;
-begin
-  FUTEX_OP := ((op and $F) shl 28) or ((cmp and $F) shl 24) or ((oparg and $FFF) shl 12) or (cmparg and $FFF);
-end;
-
 function epoll_create(size: cint): cint;
 begin
   epoll_create := do_syscall(syscall_nr_epoll_create,tsysparam(size));
@@ -310,4 +305,11 @@ begin
 end;
 {$endif}
 
+// FUTEX_OP is a macro, doesn't exist in libC as function
+function FUTEX_OP(op, oparg, cmp, cmparg: cint): cint; {$ifdef SYSTEMINLINE}inline;{$endif}
+begin
+  FUTEX_OP := ((op and $F) shl 28) or ((cmp and $F) shl 24) or ((oparg and $FFF) shl 12) or (cmparg and $FFF);
+end;
+
+
 end.