--- BasiliskII/src/video.cpp	2001/06/30 22:23:43	1.15
+++ BasiliskII/src/video.cpp	2001/07/01 12:42:01	1.17
@@ -40,7 +40,7 @@
 
 
 // List of supported video modes
-std::vector<video_mode> VideoModes;
+vector<video_mode> VideoModes;
 
 // Description of the main monitor
 monitor_desc VideoMonitor;
@@ -57,7 +57,7 @@ struct {
 	uint32 current_id;
 	uint16 preferred_mode;		// Preferred depth/resolution
 	uint32 preferred_id;
-	uint32 sp;					// Mac address of Slot Manager parameter block
+	uint32 slot_param;			// Mac address of Slot Manager parameter block
 } VidLocal;
 
 
@@ -67,7 +67,7 @@ struct {
 
 static bool has_resolution(uint32 id)
 {
-	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
+	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
 	while (i != end) {
 		if (i->resolution_id == id)
 			return true;
@@ -81,9 +81,9 @@ static bool has_resolution(uint32 id)
  *  Find specified mode (depth/resolution) (or VideoModes.end() if not found)
  */
 
-static std::vector<video_mode>::const_iterator find_mode(uint16 mode, uint32 id)
+static vector<video_mode>::const_iterator find_mode(uint16 mode, uint32 id)
 {
-	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
+	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
 	while (i != end) {
 		if (i->resolution_id == id && DepthToAppleMode(i->depth) == mode)
 			return i;
@@ -100,7 +100,7 @@ static std::vector<video_mode>::const_it
 static video_depth max_depth_of_resolution(uint32 id)
 {
 	video_depth m = VDEPTH_1BIT;
-	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
+	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
 	while (i != end) {
 		if (i->depth > m)
 			m = i->depth;
@@ -116,7 +116,7 @@ static video_depth max_depth_of_resoluti
 
 static void get_size_of_resolution(uint32 id, uint32 &x, uint32 &y)
 {
-	std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
+	vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
 	while (i != end) {
 		if (i->resolution_id == id) {
 			x = i->x;
@@ -299,8 +299,8 @@ int16 VideoDriverOpen(uint32 pb, uint32
 	Execute68kTrap(0xa71e, &r);	// NewPtrSysClear()
 	if (r.a[0] == 0)
 		return memFullErr;
-	VidLocal.sp = r.a[0];
-	D(bug("SPBlock at %08x\n", VidLocal.sp));
+	VidLocal.slot_param = r.a[0];
+	D(bug("SPBlock at %08x\n", VidLocal.slot_param));
 
 	// Find and set default gamma table
 	VidLocal.gamma_table = 0;
@@ -335,7 +335,7 @@ int16 VideoDriverControl(uint32 pb, uint
 				return paramErr;
 
 			if (mode != VidLocal.current_mode) {
-				std::vector<video_mode>::const_iterator i = find_mode(mode, VidLocal.current_id);
+				vector<video_mode>::const_iterator i = find_mode(mode, VidLocal.current_id);
 				if (i == VideoModes.end())
 					return paramErr;
 				set_gray_palette();
@@ -494,7 +494,7 @@ int16 VideoDriverControl(uint32 pb, uint
 				return paramErr;
 
 			if (mode != VidLocal.current_mode || id != VidLocal.current_id) {
-				std::vector<video_mode>::const_iterator i = find_mode(mode, id);
+				vector<video_mode>::const_iterator i = find_mode(mode, id);
 				if (i == VideoModes.end())
 					return paramErr;
 				set_gray_palette();
@@ -505,7 +505,7 @@ int16 VideoDriverControl(uint32 pb, uint
 				WriteMacInt32(param + csBaseAddr, frame_base);
 
 				M68kRegisters r;
-				uint32 sp = VidLocal.sp;
+				uint32 sp = VidLocal.slot_param;
 				r.a[0] = sp;
 
 				// Find functional sResource for this display
@@ -751,7 +751,7 @@ int16 VideoDriverStatus(uint32 pb, uint3
 			uint16 mode = ReadMacInt16(param + csDepthMode);
 			D(bug(" GetVideoParameters %04x/%08x\n", mode, id));
 
-			std::vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
+			vector<video_mode>::const_iterator i = VideoModes.begin(), end = VideoModes.end();
 			while (i != end) {
 				if (DepthToAppleMode(i->depth) == mode && i->resolution_id == id) {
 					uint32 vp = ReadMacInt32(param + csVPBlockPtr);