834505 - Wrap WinBase.h in something that #undefs GetCurrentTime macro

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Habicher [:mikeh] (high bugzilla latency)]

This macro conflict with MediaStream::GetCurrentTime() is extremely painful when you hit it, and it doesn't help that the MSVC compiler generates less-than-useful error messages about where exactly the problem is occurring.

This is done almost everywhere anyway:
http://mxr.mozilla.org/mozilla-central/ident?i=GetCurrentTime&filter=

Comment 1

[JW Wang [:jwwang] [:jw_wang]]

I tried to create a winbase.h in our source tree which is basically like:

#ifndef MOZILLA_WINBASE_H
#define MOZILLA_WINBASE_H

#include_next <winbase.h>
#undef GetCurrentTime

#endif //MOZILLA_WINBASE_H

However, MSVC doesn't support include_next...

Comment 2

[Hiroyuki Ikezoe (:hiro)]

I was hit by this on mingw build.

We can do similar way what we did for 'None' defined in X11/X.h.

Comment 3

[Karl Tomlinson (:karlt)]

Attachment: Bug 834505 undef GetCurrentTime() from windows-h-wrapper.template.h r?glandium

GetCurrentTime is declared in WinBase.h
https://github.com/tpn/winsdk-10/blob/master/Include/10.0.10240.0/um/WinBase.h#L91

Documentation for functions declared in winbase.h instruct to include
Windows.h. e.g.
https://docs.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-copyfile
Other macro declarations in winbase.h such as CopyFile() are already adjusted
with this wrapper via windows-h-unicode.decls.h

A similar, but different, static inline could be provided but is not required.

Comment 4

[Karl Tomlinson (:karlt)]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=5ead9e7be4e6542f7b3980add56b109d7f88162f

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/40b7ff3abf52
undef GetCurrentTime() from windows-h-wrapper.template.h r=glandium

Comment 6

[Alexandru Michis [:malexandru]]

https://hg.mozilla.org/mozilla-central/rev/40b7ff3abf52