~n-muench/ubuntu/oneiric/open-vm-tools/open-vm-tools-august.merge

« back to all changes in this revision

Viewing changes to lib/misc/timeutil.c

  • Committer: Bazaar Package Importer
  • Author(s): Nate Muench
  • Date: 2011-07-22 16:41:03 UTC
  • mfrom: (1.4.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110722164103-xci04yu18mjvhr1j
Tags: 2011.07.19-450511-0ubuntu1
* Merge latest upstream git tag. Fixes Building on Oneiric
  (LP: #776103, LP: #807903)

* The Toolbox (GUI) has been removed.
* Changes in debian folder:
  - Contents of open-vm-toolbox.lintian-overrides have been moved to
    open-vm-tools.lintian-overrides.
  - The contents of open-vm-toolbox.manpages (excluding the first line,
    which relates to the Toolbox) have been moved to open-vm-tools.manpages.
* Changes in debian/control:
  - Convert open-vm-toolbox into a transitional package.
  - All dependencies for toolbox have been moved to open-vm-tools package.
  - Changed architecture for open-vm-toolbox package to all.
  - Added Replaces and Breaks fields to open-vm-tools.
* Changes in debian/rules:
  - Commented out references to the Toolbox (GUI), that no longer exist
    in the package itself.
  - Remaining references changed from open-vm-toolbox to open-vm-tools.
  - Added -Wno-unused-but-set-variable to CFLAGS to suppress remaining
    issues with GCC 4.6.0 or later.
* Files removed in debian/manpages:
  - vmmemctl.9 (Component no longer in package)
  - vmware-toolbox.1 (Component removed in this release)
  - vmxnet3.9 (vmxnet3 is now included in kernel itself)

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
#include "safetime.h"
27
27
#include "unicode.h"
28
28
 
29
 
#if defined(N_PLAT_NLM)
30
 
#  include <sys/timeval.h>
31
 
#  include <nwtime.h>
32
 
#elif defined(_WIN32)
 
29
#if defined(_WIN32)
33
30
#  include <wtypes.h>
34
31
#else
35
32
#  include <sys/time.h>
871
868
}
872
869
 
873
870
 
874
 
#if !defined N_PLAT_NLM
875
871
/*
876
872
 *-----------------------------------------------------------------------------
877
873
 *
957
953
   return (VmTimeType)unixTime.tv_sec * 10000000 +
958
954
                                          unixTime.tv_nsec / 100 + UNIX_EPOCH;
959
955
}
960
 
#endif // N_PLAT_NLM
961
956
 
962
957
#ifdef _WIN32
963
958
/*
1093
1088
      struct tm tim;
1094
1089
      localtime_r(&now, &tim);
1095
1090
 
1096
 
      #if defined(sun) || defined N_PLAT_NLM
 
1091
      #if defined(sun)
1097
1092
         /*
1098
1093
          * Offset is to standard (no need for DST adjustment).
1099
1094
          * Negative is east of prime meridian.