← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Runtime/common/ldr/ldr.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Runtime/common/ldr/ldr.cpp
34
34
*******************************************************************************/
35
35
#define LOG_GROUP RTLOGGROUP_LDR
36
36
#include <iprt/ldr.h>
 
37
#include "internal/iprt.h"
 
38
 
37
39
#include <iprt/alloc.h>
38
40
#include <iprt/string.h>
39
41
#include <iprt/assert.h>
83
85
    }
84
86
    return false;
85
87
}
 
88
RT_EXPORT_SYMBOL(RTLdrIsLoadable);
86
89
 
87
90
 
88
91
/**
127
130
    LogFlow(("RTLdrGetSymbol: return %Rrc *ppvValue=%p\n", rc, *ppvValue));
128
131
    return rc;
129
132
}
 
133
RT_EXPORT_SYMBOL(RTLdrGetSymbol);
130
134
 
131
135
 
132
136
/**
161
165
    LogFlow(("RTLdrClose: returns VINF_SUCCESS\n"));
162
166
    return VINF_SUCCESS;
163
167
}
 
168
RT_EXPORT_SYMBOL(RTLdrClose);
164
169