← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to lib/include/timeutil.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/timeutil.h
35
35
#include "vm_assert.h"
36
36
 
37
37
 
38
 
#define MAX_DAYSLEFT     1024
 
38
#define MAX_DAYSLEFT     4096
39
39
 
40
40
struct timeval;
41
41
 
 
42
#ifdef _WIN32
 
43
struct timespec {
 
44
   time_t tv_sec;
 
45
   long   tv_nsec;
 
46
};
 
47
#endif
42
48
 
43
49
/* Similar to a struct tm but with slightly less weird semantics. */
44
50
typedef struct TimeUtil_Date {
113
119
                                     Bool showDate,  // IN
114
120
                                     Bool showTime); // IN
115
121
 
116
 
#if !defined _WIN32 && !defined N_PLAT_NLM
 
122
#if !defined N_PLAT_NLM
117
123
EXTERN int TimeUtil_NtTimeToUnixTime(struct timespec *unixTime, // OUT
118
124
                                     VmTimeType ntTime);        // IN
119
125
EXTERN VmTimeType TimeUtil_UnixTimeToNtTime(struct timespec unixTime); // IN