← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/include/str.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:
lib/include/str.h
44
44
#define INCLUDE_ALLOW_VMCORE
45
45
#include "includeCheck.h"
46
46
 
47
 
#if defined(GLIBC_VERSION_22)
 
47
#if defined(__linux__)
48
48
#include <wchar.h>
49
49
#elif defined(_WIN32)
50
50
#include <tchar.h>
87
87
 * strings of "wchar_t" units, regardless of platform.
88
88
 */
89
89
 
 
90
#ifdef HAS_BSD_PRINTF
 
91
EXTERN int Str_Sprintf_C_Locale(char *buf, size_t max,
 
92
                                const char *fmt, ...) PRINTF_DECL(3, 4);
 
93
#endif
 
94
 
90
95
EXTERN int Str_Sprintf(char *buf, size_t max,
91
96
                       const char *fmt, ...) PRINTF_DECL(3, 4);
92
97
EXTERN int Str_Snprintf(char *buf, size_t len,
108
113
EXTERN char *Str_SafeVasprintf(size_t *length, const char *format,
109
114
                               va_list arguments);
110
115
 
111
 
#if defined(_WIN32) || defined(GLIBC_VERSION_22) // {
 
116
#if defined(_WIN32) || defined(__linux__) // {
112
117
 
113
118
/*
114
119
 * wchar_t versions
167
172
#endif
168
173
#endif
169
174
 
170
 
#endif // } defined(_WIN32) || defined(GLIBC_VERSION_22)
 
175
#endif // } defined(_WIN32) || defined(__linux__)
171
176
 
172
177
 
173
178
/*