diff options
| author | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
|---|---|---|
| committer | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
| commit | fd892711c6bdc0ef96b6b3ea13b668cb2a38196e (patch) | |
| tree | e6ec126da2bcd6a490d5661118630edf983580ec /src/VBox/HostDrivers/Support/SUPLib.cpp | |
| parent | 8dc3a7e38d0783262b1aa8c3462e7359d8996d98 (diff) | |
| parent | b35715c68a1bec309bc1990353e35c20a21d5c47 (diff) | |
| download | virtualbox-debian/3.0.10-dfsg-2bpo50+1.tar.gz | |
Merge branch 'master' into lennydebian/3.0.10-dfsg-2bpo50+1
Conflicts:
debian/changelog
Diffstat (limited to 'src/VBox/HostDrivers/Support/SUPLib.cpp')
| -rw-r--r-- | src/VBox/HostDrivers/Support/SUPLib.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/VBox/HostDrivers/Support/SUPLib.cpp b/src/VBox/HostDrivers/Support/SUPLib.cpp index d3519285d..25df8cb41 100644 --- a/src/VBox/HostDrivers/Support/SUPLib.cpp +++ b/src/VBox/HostDrivers/Support/SUPLib.cpp @@ -271,8 +271,8 @@ SUPR3DECL(int) SUPR3Init(PSUPDRVSESSION *ppSession) CookieReq.Hdr.rc = VERR_INTERNAL_ERROR; strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC); CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION; - const uint32_t MinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x000d0000 - ? 0x000d0001 + const uint32_t MinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x000e0001 + ? 0x000e0001 : SUPDRV_IOC_VERSION & 0xffff0000; CookieReq.u.In.u32MinVersion = MinVersion; rc = suplibOsIOCtl(&g_supLibData, SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE); |