← Back to branch summary

~ubuntu-branches/ubuntu/wily/virtualbox-ose/wily

« back to all changes in this revision

Viewing changes to include/VBox/VBoxVideo.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-12-05 11:27:36 UTC
  • mfrom: (0.3.11 upstream) (0.4.21 sid)
  • Revision ID: james.westby@ubuntu.com-20101205112736-os9dcg0r9dxbfpa0
Tags: 3.2.12-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.
  - Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
    variables.
  - Add ubuntu-02-as-needed.patch to fix FTBFS with --as-needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/VBox/VBoxVideo.h
284
284
#ifdef VBOXWDDM
285
285
    , VBOXVHWACMD_TYPE_SURF_GETINFO
286
286
#endif
 
287
    , VBOXVHWACMD_TYPE_HH_DISABLE
 
288
        , VBOXVHWACMD_TYPE_HH_ENABLE
287
289
} VBOXVHWACMD_TYPE;
288
290
 
289
291
/* the command processing was asynch, set by the host to indicate asynch command completion