← Back to branch summary

~n-muench/ubuntu/maverick/open-vm-tools/open-vm-tools.fix-632101

« back to all changes in this revision

Viewing changes to lib/include/vm_basic_types.h

  • Committer: Nate Muench
  • Date: 2010-09-07 02:10:30 UTC
  • Revision ID: nowiwilldestroyabydos@gmail.com-20100907021030-msa3598ldopvwkye
http://bugs.debian.org/579721
http://bugs.debian.org/588356
https://launchpad.net/bugs/632101
* Merge from Debian testing (LP: #632101), remaining changes:
  - Recommend open-vm-toolbox in open-vm-tools.
  - Rediffing vsock.patch.
* Updating local Makefile to inject symvers files to fix vmhgfs and
  vsock modules, thanks to Joe Gooch <mrwizard@k12system.com> (Closes:
  #579721).
* Updating standards version to 3.9.1.
* Removing vmmemctl fom initscript (Closes: #588356).
* Merging upstream version 2010.06.16-268169.
* Updating standards version to 3.9.0.
* Updating README.source.
* Rediffing kvers.patch.
* Dropping procps.patch, not required anymore.
* Updating packaging for upstreams vmmemctl module removal.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/include/vm_basic_types.h
660
660
 * extra __always_inline__ attribute.
661
661
 */
662
662
#   define INLINE_SINGLE_CALLER INLINE __attribute__((__always_inline__))
663
 
#   if    defined(VMM) \
664
 
       && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 1))
665
 
#      warning Verify INLINE_SINGLE_CALLER '__always_inline__' attribute (did \
666
 
             monitor size change?)
667
 
#   endif
668
663
#else
669
664
#   define INLINE_SINGLE_CALLER INLINE
670
665
#endif