U rtl/win/sysosh.inc
--- Recording mergeinfo for merge of r41636 into '.':
U .
--- Merging r41795 into '.':
U rtl/objpas/classes/classesh.inc
U rtl/objpas/classes/collect.inc
--- Recording mergeinfo for merge of r41795 into '.':
G .
--- Merging r41881 into '.':
U rtl/objpas/sysutils/syshelph.inc
--- Recording mergeinfo for merge of r41881 into '.':
G .
--- Merging r42149 into '.':
U rtl/msdos/dos.pp
--- Recording mergeinfo for merge of r42149 into '.':
G .
--- Merging r42180 into '.':
U rtl/freebsd/sysnr.inc
--- Recording mergeinfo for merge of r42180 into '.':
G .
--- Merging r42452 into '.':
U rtl/objpas/sysutils/datih.inc
--- Recording mergeinfo for merge of r42452 into '.':
G .
--- Merging r42775 into '.':
U packages/winunits-base/src/mmsystem.pp
--- Recording mergeinfo for merge of r42775 into '.':
G .
# revisions: 41636,41795,41881,42149,42180,42452,42775
git-svn-id: branches/fixes_3_2@42911 -
+ Add sched_yield to linux unit
- Remove clone for m68k from linux unit (unimplemented assembler section)
+ Add fpsigtimedwait to baseunix unit
git-svn-id: trunk@15602 -
+ added kld* syscalls for freeBSD (tested)
+ changed "directives" macro for freeBSD unit to "extdecl" for Lazarus
+ changed MAXPATHLEN from 255 (wrong on all unices known to fpc since 1993) to 1024 for non-linux and 4096 for linux as per source code (2.4+ for linux, 1993 BSD for BSDs, Solaris 10)
git-svn-id: trunk@4779 -
