--- Merging r35130 into '.':

U    rtl/beos/sysos.inc
U    rtl/haiku/sysos.inc
U    rtl/bsd/sysos.inc
U    rtl/solaris/signal.inc
U    rtl/aix/signal.inc
U    rtl/go32v2/dpmiexcp.pp
U    rtl/linux/sysos.inc
U    rtl/netware/nwcalls.pp
U    rtl/inc/system.inc
U    rtl/inc/text.inc
U    rtl/inc/lineinfo.pp
U    rtl/objpas/classes/reader.inc
U    rtl/wince/wininc/struct.inc
U    rtl/java/jsystem.inc
--- Recording mergeinfo for merge of r35130 into '.':
 U   .
--- Merging r35792 into '.':
U    rtl/win/wininc/redef.inc
--- Recording mergeinfo for merge of r35792 into '.':
 G   .

# revisions: 35130,35792

git-svn-id: branches/fixes_3_0@36005 -

rtl/aix/signal.inc

@@ -50,7 +50,7 @@ const
   SIGSYS     = 12;      { bad argument to system call }
   SIGCLD     = SIGCHLD; { child status change }
   SIGURG     = 16;      { (+) urgent contition on I/O channel  }
-  SIGPOLL    = 23;      { pollable event occured }
+  SIGPOLL    = 23;      { pollable event occurred }
   SIGXCPU    = 24;      { exceeded cpu limit }
   SIGXFSZ    = 25;
   SIGMSG     = 27;

rtl/beos/sysos.inc

@@ -80,7 +80,7 @@ end;
 
 {
   The lowlevel file functions should take care of setting the InOutRes to the
-  correct value if an error has occured, else leave it untouched
+  correct value if an error has occurred, else leave it untouched
 }
 
 Function PosixToRunError  (PosixErrno : longint) : longint;

rtl/bsd/sysos.inc

@@ -100,7 +100,7 @@ end;
 
 {
   The lowlevel file functions should take care of setting the InOutRes to the
-  correct value if an error has occured, else leave it untouched
+  correct value if an error has occurred, else leave it untouched
 }
 
 Function PosixToRunError  (PosixErrno : longint) : longint;

rtl/go32v2/dpmiexcp.pp

@@ -1004,7 +1004,7 @@ begin
     show_call_frame(djgpp_exception_state_ptr)
 {$ifdef DPMIEXCP_DEBUG}
   else
-    errln('Exception occured in another context');
+    errln('Exception occurred in another context');
 {$endif def DPMIEXCP_DEBUG}
    ;
   if assigned(djgpp_exception_state_ptr^.__exception_ptr) then
@@ -1016,7 +1016,7 @@ begin
 {$ifdef DPMIEXCP_DEBUG}
   else
     begin
-       errln('First exception occured in another context');
+       errln('First exception occurred in another context');
        djgpp_exception_state_ptr:=djgpp_exception_state_ptr^.__exception_ptr;
        do_faulting_finish_message(false);
     end;

rtl/haiku/sysos.inc

@@ -80,7 +80,7 @@ end;
 
 {
   The lowlevel file functions should take care of setting the InOutRes to the
-  correct value if an error has occured, else leave it untouched
+  correct value if an error has occurred, else leave it untouched
 }
 
 Function PosixToRunError  (PosixErrno : longint) : longint;

rtl/inc/lineinfo.pp

@@ -71,7 +71,7 @@ type
   end;
 
 { We use static variable so almost no stack is required, and is thus
-  more safe when an error has occured in the program }
+  more safe when an error has occurred in the program }
 {$WARNING This code is not thread-safe, and needs improvement }  
 var
   e          : TExeFile;

rtl/inc/system.inc

@@ -1208,7 +1208,7 @@ Begin
      End;
 {$ifdef FPC_HAS_FEATURE_EXCEPTIONS}
    except
-     { prevent endless dump if an exception occured }
+     { prevent endless dump if an exception occurred }
    end;
 {$endif FPC_HAS_FEATURE_EXCEPTIONS}
 End;

rtl/inc/text.inc

@@ -210,7 +210,7 @@ Begin
 {$endif FPC_HAS_FEATURE_ANSISTRINGS}
 {$endif FPC_HAS_CPSTRING}
   FileFunc(TextRec(t).OpenFunc)(TextRec(t));
-  { reset the mode to closed when an error has occured }
+  { reset the mode to closed when an error has occurred }
   if InOutRes<>0 then
    TextRec(t).mode:=fmClosed;
 End;

rtl/java/jsystem.inc

@@ -1239,7 +1239,7 @@ Begin
      End;
 {$ifdef FPC_HAS_FEATURE_EXCEPTIONS}
    except
-     { prevent endless dump if an exception occured }
+     { prevent endless dump if an exception occurred }
    end;
 {$endif FPC_HAS_FEATURE_EXCEPTIONS}
 End;

rtl/linux/sysos.inc

@@ -78,7 +78,7 @@ end;
 
 {
   The lowlevel file functions should take care of setting the InOutRes to the
-  correct value if an error has occured, else leave it untouched
+  correct value if an error has occurred, else leave it untouched
 }
 
 function PosixToRunError  (PosixErrno : longint):word;

rtl/netware/nwcalls.pp

@@ -2314,7 +2314,7 @@ const
   TABLE_FULL = $8851; { 81 - Attempted to add a name into the name table after it was full }
   SOCKET_NOT_OPEN = $8852; { 82 - Listen was posted on unopened socket }
   MEM_MGR_ERROR = $8853; { 83 - Attempted enhanced memory operation failed }
-  SFT3_ERROR = $8854; { 84 - An SFT3 switch occured mid-transfer }
+  SFT3_ERROR = $8854; { 84 - An SFT3 switch occurred mid-transfer }
   PREFERRED_NOT_FOUND = $8855; { 85 - the preferred directory server was not established but another directory server was returned }
   DEVICE_NOT_RECOGNIZED = $8856; { 86 - used to determine if the device is not used by VISE so pass it on to the next redirector, if any. }
   BAD_NET_TYPE = $8857; { 87 - the network type (Bind/NDS) does not match the server version }
@@ -2621,7 +2621,7 @@ const
   NWE_NAME_TABLE_FULL = $8851; { 81 - Attempted to add a name into the name table after it was full }
   NWE_SOCKET_NOT_OPEN = $8852; { 82 - Listen was posted on unopened socket }
   NWE_MEMORY_MGR_ERROR = $8853; { 83 - Attempted enhanced memory operation failed }
-  NWE_SFT3_ERROR = $8854; { 84 - An SFT3 switch occured mid-transfer }
+  NWE_SFT3_ERROR = $8854; { 84 - An SFT3 switch occurred mid-transfer }
   NWE_DS_PREFERRED_NOT_FOUND = $8855; { 85 - the preferred directory server was not established but another directory server was returned }
   NWE_DEVICE_NOT_RECOGNIZED = $8856; { 86 - used to determine if the device is not used by VISE so pass it on to the next redirector, if any. }
   NWE_NET_INVALID_TYPE = $8857; { 87 - the network type (Bind/NDS) does not match the server version }

rtl/objpas/classes/reader.inc

@@ -906,7 +906,7 @@ begin
 
             { Don't set Result earlier because else we would come in trouble
               with the exception recover mechanism! (Result should be NIL if
-              an error occured) }
+              an error occurred) }
             Result := NewComponent;
           end;
           Include(Result.FComponentState, csLoading);

rtl/solaris/signal.inc

@@ -50,7 +50,7 @@ const
   SIGPWR     = 19;      { power-fail restart }
   SIGWINCH   = 20;      { window size change }
   SIGURG     = 21;      { urgent socket condition }
-  SIGPOLL    = 22;      { pollable event occured }
+  SIGPOLL    = 22;      { pollable event occurred }
   SIGIO      = SIGPOLL;{ socket I/O possible (SIGPOLL alias) }
   SIGVTALRM  = 28;      { virtual timer expired }
   SIGPROF    = 29;      { profiling timer expired }

rtl/win/wininc/redef.inc

@@ -823,9 +823,9 @@ function ScrollWindowEx(hWnd:HWND; dx:longint; dy:longint; prcScroll:lpRECT; prc
 //function SearchPathA(lpPath, lpFileName, lpExtension: LPCSTR; nBufferLength: DWORD; lpBuffer: LPCSTR; var lpFilePart: LPCSTR): DWORD; external 'kernel32' name 'SearchPathA';
 //function SearchPathW(lpPath, lpFileName, lpExtension: LPWSTR; nBufferLength: DWORD; lpBuffer: LPWSTR; var lpFilePart: LPWSTR): DWORD; external 'kernel32' name 'SearchPathW';
 //function SendInput(cInputs: UINT; var pInputs: TInput; cbSize: Integer): UINT;external 'user32' name 'SendInput';
-function SendMessageTimeout(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM; fuFlags, uTimeout: UINT; var lpdwResult: DWORD): LRESULT;external 'user32' name 'SendMessageTimeoutA';
-function SendMessageTimeoutA(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM; fuFlags, uTimeout: UINT; var lpdwResult: DWORD): LRESULT; external 'user32' name 'SendMessageTimeoutA';
-function SendMessageTimeoutW(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM; fuFlags, uTimeout: UINT; var lpdwResult: DWORD): LRESULT; external 'user32' name 'SendMessageTimeoutW';
+function SendMessageTimeout(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM; fuFlags, uTimeout: UINT; var lpdwResult: DWORD_PTR): LRESULT;external 'user32' name 'SendMessageTimeoutA';
+function SendMessageTimeoutA(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM; fuFlags, uTimeout: UINT; var lpdwResult: DWORD_PTR): LRESULT; external 'user32' name 'SendMessageTimeoutA';
+function SendMessageTimeoutW(hWnd: HWND; Msg: UINT; wParam: WPARAM; lParam: LPARAM; fuFlags, uTimeout: UINT; var lpdwResult: DWORD_PTR): LRESULT; external 'user32' name 'SendMessageTimeoutW';
 //function SetAclInformation(var pAcl: TACL; pAclInformation: Pointer; nAclInformationLength: DWORD; dwAclInformationClass: TAclInformationClass): BOOL; external 'advapi32' name 'SetAclInformation';
 //function SetColorAdjustment(DC: HDC; const p2: TColorAdjustment): BOOL; external 'gdi32' name 'SetColorAdjustment';
 function SetCommConfig(hCommDev: THandle; const lpCC: TCommConfig; dwSize: DWORD): BOOL; external 'kernel32' name 'SetCommConfig';

rtl/wince/wininc/struct.inc

@@ -2329,7 +2329,7 @@
      // routine when a floating point exception is detected
      _EXCEPTION = record  //+stdlib
        type_  : Integer;  //identifier type replaced by Type_ for compilation
-       Name   : PChar;    // name of function where error occured
+       Name   : PChar;    // name of function where error occurred
        arg1   : double;   // first argument to function
        arg2   : double;   // second argument (if any) to function
        retval : double;   // value to be returned by function