← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/include/hostinfo.h

  • Committer: Bazaar Package Importer
  • Author(s): Nate Muench
  • Date: 2010-09-06 21:06:01 UTC
  • mfrom: (2.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20100906210601-gxxy30e5roil4srt
Tags: 2010.06.16-268169-3ubuntu1
https://launchpad.net/bugs/632101
* Merge from Debian testing (LP: #632101), remaining changes:
  - Recommend open-vm-toolbox in open-vm-tools.
  - Rediffing vsock.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/include/hostinfo.h
57
57
extern char *Hostinfo_GetCpuDescription(uint32 cpuNumber);
58
58
extern void Hostinfo_GetTimeOfDay(VmTimeType *time);
59
59
extern VmTimeType Hostinfo_SystemUpTime(void);
60
 
extern VmTimeType Hostinfo_RawSystemTimerUS(void);
 
60
extern VmTimeType Hostinfo_SystemTimerNS(void);
61
61
extern VmTimeType Hostinfo_SystemTimerUS(void);
62
 
extern int Hostinfo_OSVersion(int i);
 
62
extern int Hostinfo_OSVersion(unsigned int i);
63
63
extern int Hostinfo_GetSystemBitness(void);
64
64
extern const char *Hostinfo_OSVersionString(void);
65
65