The open source OpenXR runtime
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

i/xrt: Fix warning caused by use of C extension

Anonymous types declared in an anonymous union are an extension, apparently

Only Clang issues a warning, not GCC, which is how this slipped through.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2472>

+25 -21
+25 -21
src/xrt/include/xrt/xrt_defines.h
··· 1893 1893 XRT_OUTPUT_VALUE_TYPE_FORCE_FEEDBACK, 1894 1894 }; 1895 1895 1896 + struct xrt_output_value_vibration 1897 + { 1898 + float frequency; 1899 + float amplitude; 1900 + int64_t duration_ns; 1901 + }; 1902 + 1903 + struct xrt_output_value_pcm_vibration 1904 + { 1905 + uint32_t buffer_size; 1906 + const float *buffer; 1907 + float sample_rate; 1908 + bool append; 1909 + uint32_t *samples_consumed; 1910 + }; 1911 + 1912 + struct xrt_output_value_force_feedback 1913 + { 1914 + struct xrt_output_force_feedback force_feedback[5]; 1915 + uint64_t force_feedback_location_count; 1916 + }; 1917 + 1896 1918 /*! 1897 1919 * A union of all output types. 1898 1920 * ··· 1904 1926 enum xrt_output_value_type type; 1905 1927 1906 1928 union { 1907 - struct 1908 - { 1909 - float frequency; 1910 - float amplitude; 1911 - int64_t duration_ns; 1912 - } vibration; 1913 - 1914 - struct 1915 - { 1916 - uint32_t buffer_size; 1917 - const float *buffer; 1918 - float sample_rate; 1919 - bool append; 1920 - uint32_t *samples_consumed; 1921 - } pcm_vibration; 1922 - 1923 - struct 1924 - { 1925 - struct xrt_output_force_feedback force_feedback[5]; 1926 - uint64_t force_feedback_location_count; 1927 - } force_feedback; 1929 + struct xrt_output_value_vibration vibration; 1930 + struct xrt_output_value_pcm_vibration pcm_vibration; 1931 + struct xrt_output_value_force_feedback force_feedback; 1928 1932 }; 1929 1933 }; 1930 1934