diff --git a/BasiliskII/src/Unix/prefs_editor_gtk.cpp b/BasiliskII/src/Unix/prefs_editor_gtk.cpp index 53d45f61..dc8b7e6e 100644 --- a/BasiliskII/src/Unix/prefs_editor_gtk.cpp +++ b/BasiliskII/src/Unix/prefs_editor_gtk.cpp @@ -28,9 +28,13 @@ #include #include #include - +#include #include +#ifdef HAfVE_SYS_STAT_H +#include +#endif + #ifdef HAVE_GNOMEUI #include #endif @@ -414,12 +418,12 @@ static void mn_about(...) const char *authors[] = { "Christian Bauer", "Orlando Bassotto", - "Gwenolé Beauchesne", + "Gwenolé Beauchesne", "Marc Chabanas", "Marc Hellwig", "Biill Huey", "Brian J. Johnson", - "Jürgen Lachmann", + "Jürgen Lachmann", "Samuel Lander", "David Lawrence", "Lauri Pesonen", @@ -1291,7 +1295,7 @@ static GList *add_serial_names(void) #if defined(__linux__) if (strncmp(de->d_name, "ttyS", 4) == 0 || strncmp(de->d_name, "lp", 2) == 0) { #elif defined(__FreeBSD__) - if (strncmp(de->d_name, "cuaa", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { + if (strncmp(de->d_name, "cua", 3) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { #elif defined(__NetBSD__) if (strncmp(de->d_name, "tty0", 4) == 0 || strncmp(de->d_name, "lpt", 3) == 0) { #elif defined(sgi) diff --git a/BasiliskII/src/Unix/sys_unix.cpp b/BasiliskII/src/Unix/sys_unix.cpp index 9cfc06ce..1f1c89a2 100755 --- a/BasiliskII/src/Unix/sys_unix.cpp +++ b/BasiliskII/src/Unix/sys_unix.cpp @@ -369,6 +369,9 @@ void SysAddCDROMPrefs(void) closedir(cd_dir); } } +#elif defined __FreeBSD__ + if (access("/cdrom", F_OK) == 0) + PrefsAddString("cdrom", "/cdrom"); #elif defined __MACOSX__ // There is no predefined path for CD-ROMs on MacOS X. Rather, we // define a single fake CD-ROM entry for the emulated MacOS. @@ -396,8 +399,8 @@ void SysAddSerialPrefs(void) PrefsAddString("serialb", "/dev/tts/1"); } #elif defined(__FreeBSD__) - PrefsAddString("seriala", "/dev/cuaa0"); - PrefsAddString("serialb", "/dev/cuaa1"); + PrefsAddString("seriala", "/dev/cuau0"); + PrefsAddString("serialb", "/dev/cuau1"); #elif defined(__NetBSD__) PrefsAddString("seriala", "/dev/tty00"); PrefsAddString("serialb", "/dev/tty01");