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

« back to all changes in this revision

Viewing changes to lib/include/vmware/tools/utils.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:
89
89
#  define VMTOOLS_RELEASE_FILENAME_LOCAL(path)   g_free(path)
90
90
#endif
91
91
 
 
92
/** Convenience macro around VMTools_WrapArray. */
 
93
#define VMTOOLS_WRAP_ARRAY(a) VMTools_WrapArray((a), sizeof *(a), G_N_ELEMENTS(a))
 
94
 
 
95
 
92
96
G_BEGIN_DECLS
93
97
 
94
98
void
129
133
 
130
134
#endif
131
135
 
 
136
GSource *
 
137
VMTools_CreateTimer(gint timeout);
 
138
 
132
139
GArray *
133
140
VMTools_WrapArray(gconstpointer data,
134
141
                  guint elemSize,