← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/misc/timeutil.c

  • 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/misc/timeutil.c
539
539
    * refinement/accuracy than what we are doing below.
540
540
    */
541
541
 
542
 
   NOT_TESTED();
543
 
 
544
542
   // Get the system time in UTC format.
545
543
   GetSystemTimeAsFileTime(&ft);
546
544
   
872
870
#endif // _WIN32
873
871
}
874
872
 
875
 
#if !defined _WIN32 && !defined N_PLAT_NLM
 
873
 
 
874
#if !defined N_PLAT_NLM
876
875
/*
877
876
 *-----------------------------------------------------------------------------
878
877
 *
958
957
   return (VmTimeType)unixTime.tv_sec * 10000000 +
959
958
                                          unixTime.tv_nsec / 100 + UNIX_EPOCH;
960
959
}
961
 
#endif // _WIN32 && N_PLAT_NLM
 
960
#endif // N_PLAT_NLM
962
961
 
963
962
#ifdef _WIN32
964
963
/*