Skip to content

Commit 5541c0d

Browse files
committed
Win32: Make rb_w32_osid return Windows NT always
Since support for Windows 9x was dropped over a decade ago.
1 parent f939f04 commit 5541c0d

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

include/ruby/win32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ extern const char *WSAAPI rb_w32_inet_ntop(int,const void *,char *,size_t);
307307
extern int WSAAPI rb_w32_inet_pton(int,const char *,void *);
308308

309309
RBIMPL_ATTR_DEPRECATED(("as Windows 9x is not supported already"))
310-
extern DWORD rb_w32_osid(void);
310+
static inline DWORD rb_w32_osid(void) {return VER_PLATFORM_WIN32_NT;}
311311
RBIMPL_ATTR_DEPRECATED(("by Windows Version Helper APIs"))
312312
extern DWORD rb_w32_osver(void);
313313

win32/win32.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -314,15 +314,6 @@ get_version(void)
314314
GetVersionEx(&osver);
315315
}
316316

317-
#ifdef _M_IX86
318-
/* License: Artistic or GPL */
319-
DWORD
320-
rb_w32_osid(void)
321-
{
322-
return osver.dwPlatformId;
323-
}
324-
#endif
325-
326317
/* License: Artistic or GPL */
327318
DWORD
328319
rb_w32_osver(void)

0 commit comments

Comments
 (0)