← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/virtualbox-ose/oneiric

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VBoxBFE/SDLConsole.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VBoxBFE/SDLConsole.cpp
37
37
#include <VBox/types.h>
38
38
#include <VBox/err.h>
39
39
#include <VBox/param.h>
40
 
#include <VBox/pdm.h>
 
40
#include <VBox/vmm/pdm.h>
41
41
#include <VBox/log.h>
42
42
#include <VBox/version.h>
43
43
#include <iprt/path.h>
1398
1398
        bi.bV5Planes = 1;
1399
1399
        bi.bV5BitCount = 32;
1400
1400
        bi.bV5Compression = BI_BITFIELDS;
1401
 
        // specifiy a supported 32 BPP alpha format for Windows XP
 
1401
        // specify a supported 32 BPP alpha format for Windows XP
1402
1402
        bi.bV5RedMask   = 0x00FF0000;
1403
1403
        bi.bV5GreenMask = 0x0000FF00;
1404
1404
        bi.bV5BlueMask  = 0x000000FF;