Skip to content

Commit

Permalink
Switch Amiga OS3 build to use clib2
Browse files Browse the repository at this point in the history
Exceptions are working again on the clib2 support library, while
using newlib is causing crashes at startup, so switching back to
clib2.
  • Loading branch information
Colin Ward authored and hitman-codehq committed May 25, 2023
1 parent 2142eca commit a8e5ed7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions RADRunner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ static void StartClient(unsigned short a_port)
}
}
}
catch (std::runtime_error& a_exception)
catch (RSocket::Error &a_exception)
{
Utils::Error(a_exception.what());
}
Expand Down Expand Up @@ -433,13 +433,13 @@ static void StartServer(unsigned short a_port)
}
}
}
catch (RSocket::Error &exception)
catch (RSocket::Error &a_exception)
{
/* If the result was 0 then the remote socket has been closed and we want to go back to listening. */
/* Otherwise it is a "real" socket error, so display an error and shut down */
if (exception.m_result != 0)
if (a_exception.m_result != 0)
{
printf("Unable to perform I/O on socket (Error = %d)!\n", exception.m_result);
printf("Unable to perform I/O on socket (Error = %d)!\n", a_exception.m_result);
shutdown = true;
}
}
Expand Down
6 changes: 3 additions & 3 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ ifdef PREFIX
LFLAGS += -athread=native
OBJ := $(OBJ)_OS4
else
IFLAGS += -mcrt=nix20
LFLAGS += -mcrt=nix20
LIBS += -ldebug -lsocket
IFLAGS += -mcrt=clib2
LFLAGS += -mcrt=clib2
LIBS += -lnet
endif
endif

Expand Down

0 comments on commit a8e5ed7

Please sign in to comment.