Merged revisions 1246-1247 via svnmerge from

http://[email protected]/svn/fpc/trunk

r1246 (peter)
  * BDR_SUNKENOUTER = 2


r1247 (peter)
  * fix shmat from Nikolay Nikolov

git-svn-id: branches/fixes_2_0@1291 -

rtl/linux/ipcsys.inc

@@ -32,14 +32,8 @@ begin
 end;
 
 function shmat (shmid:cint; shmaddr:pointer; shmflg:cint): pointer;
-Var raddr : pointer;
-    error : ptrint;
 begin
-  error:=do_syscall(syscall_nr_SHMAT,TSysParam(shmid),TSysParam(shmflg),TSysParam(@raddr),TSysParam(shmaddr));
-  If Error<0 then
-    shmat:=pointer(error)
-  else
-    shmat:=raddr;
+  shmat:=pointer(do_syscall(syscall_nr_SHMAT,TSysParam(shmid),TSysParam(shmaddr),TSysParam(shmflg)));
 end;
 
 function shmdt (shmaddr:pointer): cint;

rtl/win32/wininc/defines.inc

@@ -925,7 +925,7 @@
      BDR_RAISEDINNER = 4;
      BDR_SUNKENINNER = 8;
      BDR_RAISEDOUTER = 1;
-     BDR_SUNKENOUTER = 1;
+     BDR_SUNKENOUTER = 2;
      EDGE_BUMP = 9;
      EDGE_ETCHED = 6;
      EDGE_RAISED = 5;