Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace occurences of #if _WIN32 with #ifdef _WIN32 #215

Merged
merged 1 commit into from
Nov 16, 2020

Conversation

ChristophHaag
Copy link
Contributor

I got this warning while compiling a project including the loader. Looks like it should have been #ifdef.

In file included from _deps/openxr-src/src/loader/loader_logger_recorders.cpp:22:
_deps/openxr-src/src/loader/loader_logger_recorders.hpp:40:5: warning: "_WIN32" is not defined, evaluates to 0 [-Wundef]
   40 | #if _WIN32
      |     ^~~~~~

@rpavlik
Copy link
Contributor

rpavlik commented Nov 13, 2020

Did you use a different committer address? The CLA bot is confused, even though I know you have signed it.

@rpavlik
Copy link
Contributor

rpavlik commented Nov 13, 2020

(also please add a changelog fragment)

@ChristophHaag
Copy link
Contributor Author

Changelog fragment is added.

I do believe I signed the CLA with this account and mail address and I didn't do anyhting special.

@rpavlik
Copy link
Contributor

rpavlik commented Nov 16, 2020

Ah, it's working now, thanks!

@rpavlik rpavlik merged commit 7d6eae9 into KhronosGroup:master Nov 16, 2020
@ChristophHaag ChristophHaag deleted the ifdef_win32 branch November 16, 2020 19:38
rpavlik added a commit that referenced this pull request Nov 24, 2020
The SDK in this release features some fixes to the loader’s layer
parsing: upgrading is recommended. The hello_xr example has also been
improved. The registry for this release features a new ratified Khronos
extension which will serve as the basis of other extensions, as well as
a number of new vendor extensions.

-   Registry
    -   Add XR_HTC_vive_cosmos_controller_interaction vendor extension.
        (internal MR 1907)
    -   Add XR_FB_display_refresh_rate vendor extension. (internal MR
        1909)
    -   Add XR_MSFT_perception_anchor_interop vendor extension.
        (internal MR 1929)
    -   Added ratified KHR_binding_modifications Khronos extension.
        (internal MR 1878, internal issue 1413)
    -   Reserve vendor extensions for HTC. (internal MR 1907)
    -   Reserve vendor extension numbers 109-120 for Facebook
        extensions. (internal MR 1913)
-   SDK
    -   Fix build errors under mingw-w64. (OpenXR-SDK-Source/#212)
    -   Include PDB symbols to go along with the openxr_loader.dll
        Windows artifacts. (OpenXR-SDK-Source/#225)
    -   XrMatrix4x4f_CreateProjection: Explicitly define matrix values
        as floats. Prevents potential division by zero.
        (OpenXR-SDK-Source/#219)
    -   build: Normalize how we detect and utilize threading libraries
        in the build process. (internal MR 1910)
    -   build: Search for OpenGL ES and other things needed on Android.
        (internal MR 1910)
    -   build: Normalize how we detect and utilize Vulkan in the build
        process. (internal MR 1910)
    -   build/ci: Have Windows loader artifacts organize themselves by
        architecture/platform, and bundle the CMake config files and a
        “meta” CMake config. (OpenXR-SDK-Source/#224,
        OpenXR-SDK-Source/#185)
    -   documentation: Make API Layer manifest example for
        “disable_environment” and “enable_environment” match the loader
        behavior (internal MR 1917, OpenXR-SDK-Source/#213)
    -   hello_xr: Don’t use subaction paths for quit_session action,
        it’s unnecessary. (internal MR 1898)
    -   hello_xr: Add initial build system support for building for
        Android. (No gradle support yet.) (internal MR 1910)
    -   hello_xr: Call xrInitializeLoaderKHR and dynamically load
        openxr_loader on Android. (internal MR 1910)
    -   hello_xr: Fix printing of action bindings and make it prettier.
        (internal MR 1914)
    -   hello_xr: Fix break on Oculus Quest. (internal MR 1921)
    -   hello_xr: The D3D12 and Vulkan graphics plugins sometimes did
        not update their swapchain image context maps due to rare key
        collisions. (OpenXR-SDK-Source/#217)
    -   loader: Stub in some preliminary code for Android loader
        support - not a complete port. (internal MR 1910)
    -   loader: Add Android logcat logger. (internal MR 1910)
    -   loader: Fix parsing of XR_ENABLE_API_LAYERS environment variable
        (internal MR 1912)
    -   loader: Fix issues around xrInitializeLoaderKHR. (internal MR
        1922)
    -   loader: Replace #if _WIN32 with #ifdef _WIN32.
        (OpenXR-SDK-Source/#215)
rhabacker pushed a commit to rhabacker/OpenXR-SDK-Source that referenced this pull request Nov 16, 2022
The SDK in this release features some fixes to the loader’s layer
parsing: upgrading is recommended. The hello_xr example has also been
improved. The registry for this release features a new ratified Khronos
extension which will serve as the basis of other extensions, as well as
a number of new vendor extensions.

-   Registry
    -   Add XR_HTC_vive_cosmos_controller_interaction vendor extension.
        (internal MR 1907)
    -   Add XR_FB_display_refresh_rate vendor extension. (internal MR
        1909)
    -   Add XR_MSFT_perception_anchor_interop vendor extension.
        (internal MR 1929)
    -   Added ratified KHR_binding_modifications Khronos extension.
        (internal MR 1878, internal issue 1413)
    -   Reserve vendor extensions for HTC. (internal MR 1907)
    -   Reserve vendor extension numbers 109-120 for Facebook
        extensions. (internal MR 1913)
-   SDK
    -   Fix build errors under mingw-w64. (OpenXR-SDK-Source/KhronosGroup#212)
    -   Include PDB symbols to go along with the openxr_loader.dll
        Windows artifacts. (OpenXR-SDK-Source/KhronosGroup#225)
    -   XrMatrix4x4f_CreateProjection: Explicitly define matrix values
        as floats. Prevents potential division by zero.
        (OpenXR-SDK-Source/KhronosGroup#219)
    -   build: Normalize how we detect and utilize threading libraries
        in the build process. (internal MR 1910)
    -   build: Search for OpenGL ES and other things needed on Android.
        (internal MR 1910)
    -   build: Normalize how we detect and utilize Vulkan in the build
        process. (internal MR 1910)
    -   build/ci: Have Windows loader artifacts organize themselves by
        architecture/platform, and bundle the CMake config files and a
        “meta” CMake config. (OpenXR-SDK-Source/KhronosGroup#224,
        OpenXR-SDK-Source/KhronosGroup#185)
    -   documentation: Make API Layer manifest example for
        “disable_environment” and “enable_environment” match the loader
        behavior (internal MR 1917, OpenXR-SDK-Source/KhronosGroup#213)
    -   hello_xr: Don’t use subaction paths for quit_session action,
        it’s unnecessary. (internal MR 1898)
    -   hello_xr: Add initial build system support for building for
        Android. (No gradle support yet.) (internal MR 1910)
    -   hello_xr: Call xrInitializeLoaderKHR and dynamically load
        openxr_loader on Android. (internal MR 1910)
    -   hello_xr: Fix printing of action bindings and make it prettier.
        (internal MR 1914)
    -   hello_xr: Fix break on Oculus Quest. (internal MR 1921)
    -   hello_xr: The D3D12 and Vulkan graphics plugins sometimes did
        not update their swapchain image context maps due to rare key
        collisions. (OpenXR-SDK-Source/KhronosGroup#217)
    -   loader: Stub in some preliminary code for Android loader
        support - not a complete port. (internal MR 1910)
    -   loader: Add Android logcat logger. (internal MR 1910)
    -   loader: Fix parsing of XR_ENABLE_API_LAYERS environment variable
        (internal MR 1912)
    -   loader: Fix issues around xrInitializeLoaderKHR. (internal MR
        1922)
    -   loader: Replace #if _WIN32 with #ifdef _WIN32.
        (OpenXR-SDK-Source/KhronosGroup#215)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants