← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/freebsd/vmmemctl/vm_basic_defs.h

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-03-20 10:19:00 UTC
  • mfrom: (1.1.4 upstream) (2.4.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090320101900-1o604camiubq2de8
Tags: 2009.03.18-154848-2
http://bugs.debian.org/520493
Correcting patch system depends (Closes: #520493).

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/freebsd/vmmemctl/vm_basic_defs.h
60
60
    (!defined KERNEL && !defined _KERNEL && !defined VMKERNEL && !defined __KERNEL__)
61
61
#   include <stddef.h>
62
62
#else
63
 
// XXX the __cplusplus one matches that of VC++, to prevent redefinition warning
 
63
// XXX the _WIN32 one matches that of VC++, to prevent redefinition warning
64
64
// XXX the other one matches that of gcc3.3.3/glibc2.2.4 to prevent redefinition warnings
65
65
#ifndef offsetof
66
 
#ifdef __cplusplus
 
66
#ifdef _WIN32
67
67
#define offsetof(s,m)   (size_t)&(((s *)0)->m)
68
68
#else
69
69
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
362
362
#ifdef _WIN32 // {
363
363
 
364
364
#define snprintf  _snprintf
 
365
#define strtok_r  strtok_s
 
366
 
 
367
#if (_MSC_VER < 1500)
365
368
#define vsnprintf _vsnprintf
366
 
#define strtok_r  strtok_s
 
369
#endif
367
370
 
368
371
typedef int uid_t;
369
372
typedef int gid_t;