* winsup.h: Add `winME' to os_type symbols.
* dcrt0.cc (set_os_type): Identify Windows ME systems.
        * (host_dependent_constants::init): Care for winME.
        * uname.cc (uname): Ditto.
			
			
This commit is contained in:
		
							parent
							
								
									b504f11afa
								
							
						
					
					
						commit
						84ecbb38d6
					
				|  | @ -1,3 +1,10 @@ | |||
| Sat Sep 30 03:34:00 2000  Corinna Vinschen <corinna@vinschen.de> | ||||
| 
 | ||||
| 	* winsup.h: Add `winME' to os_type symbols. | ||||
| 	* dcrt0.cc (set_os_type): Identify Windows ME systems. | ||||
| 	* (host_dependent_constants::init): Care for winME. | ||||
| 	* uname.cc (uname): Ditto. | ||||
| 
 | ||||
| Thu Sep 28 01:46:00 2000  Corinna Vinschen <corinna@vinschen.de> | ||||
| 
 | ||||
| 	* net.cc (get_ifconf): Code cleanup. Split. Call os dependent | ||||
|  |  | |||
|  | @ -177,11 +177,16 @@ set_os_type () | |||
| 	    os_being_run = win95; | ||||
| 	    os = "95"; | ||||
| 	  } | ||||
| 	else /* os_version_info.dwMinorVersion == 10 */ | ||||
| 	else if (os_version_info.dwMinorVersion < 90) | ||||
| 	  { | ||||
| 	    os_being_run = win98; | ||||
| 	    os = "98"; | ||||
| 	  } | ||||
| 	else /* os_version_info.dwMinorVersion == 90 */ | ||||
| 	  { | ||||
| 	    os_being_run = winME; | ||||
| 	    os = "ME"; | ||||
| 	  } | ||||
| 	break; | ||||
|       default: | ||||
| 	os_being_run = unknown; | ||||
|  | @ -213,6 +218,7 @@ host_dependent_constants::init () | |||
|       shared = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; | ||||
|       break; | ||||
| 
 | ||||
|     case winME: | ||||
|     case win98: | ||||
|     case win95: | ||||
|     case win32s: | ||||
|  |  | |||
|  | @ -59,6 +59,7 @@ uname (struct utsname *name) | |||
| 	  { | ||||
| 	    case win95: | ||||
| 	    case win98: | ||||
| 	    case winME: | ||||
| 	      /* dwProcessorType only valid in Windows 95 */ | ||||
| 	      if ((sysinfo.dwProcessorType == PROCESSOR_INTEL_386) || | ||||
| 		  (sysinfo.dwProcessorType == PROCESSOR_INTEL_486) || | ||||
|  |  | |||
|  | @ -74,7 +74,7 @@ return __res; | |||
| extern "C" DWORD WINAPI GetLastError (void); | ||||
| 
 | ||||
| /* Used for runtime OS check/decisions. */ | ||||
| enum os_type {winNT = 1, win95, win98, win32s, unknown}; | ||||
| enum os_type {winNT = 1, win95, win98, winME, win32s, unknown}; | ||||
| extern os_type os_being_run; | ||||
| 
 | ||||
| /* Used to check if Cygwin DLL is dynamically loaded. */ | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue