ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/BasiliskII/src/Unix/sys_unix.cpp

Comparing BasiliskII/src/Unix/sys_unix.cpp (file contents):
Revision 1.19 by nigel, 2003-03-21T07:03:05Z vs.
Revision 1.20 by gbeauche, 2003-10-12T21:55:44Z

#	Line 145 | Line 145 | void SysAddFloppyPrefs(void)
145		PrefsAddString("floppy", "/dev/fd0a");
146		PrefsAddString("floppy", "/dev/fd1a");
147		#elif defined(__APPLE__) && defined(__MACH__)
148	+	// FIXME: We assume an Aqua build causes <AvailabilityMacros.h> to
149	+	// be included, thusly enabling this part of code that would cause
150	+	// Basilisk II to hang otherwise.
151	+	#ifdef MAC_OS_X_VERSION_10_0
152		PrefsAddString("floppy", "/dev/fd/0");
153		PrefsAddString("floppy", "/dev/fd/1");
154	+	#endif
155		#else
156		PrefsAddString("floppy", "/dev/fd0");
157		PrefsAddString("floppy", "/dev/fd1");
#	Line 217 | Line 222 | void SysAddCDROMPrefs(void)
222		closedir(cd_dir);
223		}
224		}
225	<	#elif defined(__APPLE__) && defined(__MACH__)
225	>	#elif defined(__APPLE__) && defined(__MACH__) && defined(MAC_OS_X_VERSION_10_0)
226		extern  void DarwinAddCDROMPrefs(void);
227
228		DarwinAddCDROMPrefs();
#	Line 248 | Line 253 | void SysAddSerialPrefs(void)
253		PrefsAddString("seriala", "/dev/tty00");
254		PrefsAddString("serialb", "/dev/tty01");
255		#elif defined(__APPLE__) && defined(__MACH__)
256	+	// FIXME: We assume an Aqua build causes <AvailabilityMacros.h> to
257	+	// be included, thusly enabling this part of code that would cause
258	+	// Basilisk II to hang otherwise.
259	+	#ifdef MAC_OS_X_VERSION_10_0
260		PrefsAddString("seriala", "/dev/ttys0");
261		PrefsAddString("serialb", "/dev/ttys1");
262	+	#endif
263		//      PrefsAddString("seriala", "/dev/cu.modem");
264		//      PrefsAddString("serialb", "/dev/cu.IrDA-IrCOMMch-b");
265		#endif

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines