← Back to branch summary

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

« back to all changes in this revision

Viewing changes to services/vmtoolsd/toolsCoreInt.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:
services/vmtoolsd/toolsCoreInt.h
37
37
 
38
38
/* Used by the Windows implementation to communicate with other processes. */
39
39
#if defined(G_PLATFORM_WIN32)
40
 
#  define QUIT_EVENT_NAME_FMT         L"Global\\VMwareToolsQuitEvent_%s"
41
 
#  define DUMP_STATE_EVENT_NAME_FMT   L"Global\\VMwareToolsDumpStateEvent_%s"
 
40
#  define QUIT_EVENT_NAME_FMT         L"%S\\VMwareToolsQuitEvent_%s"
 
41
#  define DUMP_STATE_EVENT_NAME_FMT   L"%S\\VMwareToolsDumpStateEvent_%s"
42
42
#endif
43
43
 
44
44
/* On Mac OS, G_MODULE_SUFFIX seems to be defined to "so"... */
79
79
   guint          configCheckTask;
80
80
   gboolean       log;
81
81
   gboolean       mainService;
 
82
   gboolean       capsRegistered;
82
83
   gchar         *commonPath;
83
84
   gchar         *pluginPath;
84
85
   GPtrArray     *plugins;
141
142
ToolsCore_CFRunLoop(ToolsServiceState *state);
142
143
#endif
143
144
 
 
145
void
 
146
ToolsCorePool_Init(ToolsAppCtx *ctx);
 
147
 
 
148
void
 
149
ToolsCorePool_Shutdown(ToolsAppCtx *ctx);
 
150
 
144
151
#endif /* _TOOLSCOREINT_H_ */
145
152