~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to lib/include/iovector.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
* 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:
76
76
                                struct iovec *staticEntries,
77
77
                                VMIOVec *iovOut);
78
78
 
79
 
EXTERN INLINE void IOV_MakeSingleIOV(VMIOVec* v,
80
 
                                     struct iovec* iov,
81
 
                                     SectorType startSector,
82
 
                                     SectorType dataLen,
83
 
                                     uint32 sectorSize,
84
 
                                     uint8* buffer,
85
 
                                     Bool read);
 
79
EXTERN void IOV_MakeSingleIOV(VMIOVec* v,
 
80
                              struct iovec* iov,
 
81
                              SectorType startSector,
 
82
                              SectorType dataLen,
 
83
                              uint32 sectorSize,
 
84
                              uint8* buffer,
 
85
                              Bool read);
86
86
 
87
87
EXTERN void IOV_WriteIovToBuf(struct iovec* entries,
88
88
                              int numEntries,