diff --git a/gcc/ada/g-stseme.adb b/gcc/ada/g-stseme.adb index b09af1d6fb8..4b1720fb216 100644 --- a/gcc/ada/g-stseme.adb +++ b/gcc/ada/g-stseme.adb @@ -35,9 +35,15 @@ -- ones: there is a specific variant of this function in g-socthi-mingw.adb. with Ada.Unchecked_Conversion; + with System.CRTL; separate (GNAT.Sockets.Thin) + +-------------------------- +-- Socket_Error_Message -- +-------------------------- + function Socket_Error_Message (Errno : Integer) return C.Strings.chars_ptr is @@ -56,6 +62,7 @@ is begin C_Msg := To_Chars_Ptr (System.CRTL.strerror (Errno)); + if C_Msg = C.Strings.Null_Ptr then return Unknown_System_Error; else diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 99c24a12a2e..899b1a05878 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -1251,7 +1251,7 @@ package body Sem_Ch4 is Analyze_Expression (Else_Expr); end if; - if not Is_Overloaded (Then_Expr) then + if not Is_Overloaded (Then_Expr) then Set_Etype (N, Etype (Then_Expr)); else declare