← Back to branch summary

~ubuntu-branches/ubuntu/precise/open-vm-tools/precise

« back to all changes in this revision

Viewing changes to modules/linux/vsock/linux/vsockCommon.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/vsock/linux/vsockCommon.h
71
71
#elif defined __APPLE__
72
72
#  if defined KERNEL
73
73
#     include <IOKit/system.h>
74
 
#     define VMCI_SOCKETS_AF_VALUE PF_SYSTEM
 
74
#     define VMCI_SOCKETS_AF_VALUE   14
75
75
#     define VMCISockGetAFValueInt() VMCI_SOCKETS_AF_VALUE
76
76
#  else // KERNEL
77
77
#     define VMCISockGetAFValueInt() VMCISock_GetAFValue()
79
79
#endif // __APPLE__
80
80
 
81
81
#include "vmware.h"
 
82
#include "vm_basic_asm.h"
82
83
#include "vmci_defs.h"
83
84
#include "vmci_call_defs.h"
 
85
#include "vmci_infrastructure.h"
84
86
#include "vmci_sockets_int.h"
85
87
#include "vmci_sockets.h"
86
88