[haiku-commits] Re: haiku: hrev53530 - headers/os/drivers/usb src/apps/icon-o-matic/shape/commands

  • From: "Alexander von Gluck IV" <kallisti5@xxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx, jerome.duval@xxxxxxxxx
  • Date: Tue, 08 Oct 2019 13:34:13 +0000

October 7, 2019 3:34 PM, "Jérôme Duval" <jerome.duval@xxxxxxxxx> wrote:

hrev53530 adds 2 changesets to branch 'master'
############################################################################

Revision: hrev53530
Commit: c84296d0ad5ed9b6af83f04ea5dd59f15840765b
URL: https://git.haiku-os.org/haiku/commit/?id=c84296d0ad5e
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Mon Oct 7 19:57:45 2019 UTC

USB_hid: fix include guard.


This "Shouldn't have" but looks like did break *all* of the builds.
Could you fix?


In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:36:2: error: 
'B_HID_UID_GAM_PLAYER' conflicts with a previous declaration
  B_HID_UID_GAM_PLAYER,
  ^~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:36:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_PLAYER'
  B_HID_UID_GAM_PLAYER,
  ^~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:37:2: error: 
'B_HID_UID_GAM_GUN_BOLT' conflicts with a previous declaration
  B_HID_UID_GAM_GUN_BOLT,
  ^~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:37:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GUN_BOLT'
  B_HID_UID_GAM_GUN_BOLT,
  ^~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:38:2: error: 
'B_HID_UID_GAM_GUN_CLIP' conflicts with a previous declaration
  B_HID_UID_GAM_GUN_CLIP,
  ^~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:38:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GUN_CLIP'
  B_HID_UID_GAM_GUN_CLIP,
  ^~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:39:2: error: 
'B_HID_UID_GAM_GUN_SELECTOR' conflicts with a previous declaration
  B_HID_UID_GAM_GUN_SELECTOR,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:39:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GUN_SELECTOR'
  B_HID_UID_GAM_GUN_SELECTOR,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:40:2: error: 
'B_HID_UID_GAM_GUN_SINGLE_SHOT' conflicts with a previous declaration
  B_HID_UID_GAM_GUN_SINGLE_SHOT,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:40:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GUN_SINGLE_SHOT'
  B_HID_UID_GAM_GUN_SINGLE_SHOT,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:41:2: error: 
'B_HID_UID_GAM_GUN_BURST' conflicts with a previous declaration
  B_HID_UID_GAM_GUN_BURST,
  ^~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:41:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GUN_BURST'
  B_HID_UID_GAM_GUN_BURST,
  ^~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:42:2: error: 
'B_HID_UID_GAM_GUN_AUTOMATIC' conflicts with a previous declaration
  B_HID_UID_GAM_GUN_AUTOMATIC,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:42:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GUN_AUTOMATIC'
  B_HID_UID_GAM_GUN_AUTOMATIC,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:43:2: error: 
'B_HID_UID_GAM_GUN_SAFETY' conflicts with a previous declaration
  B_HID_UID_GAM_GUN_SAFETY,
  ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:43:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GUN_SAFETY'
  B_HID_UID_GAM_GUN_SAFETY,
  ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:44:2: error: 
'B_HID_UID_GAM_GAMEPAD_FIRE_JUMP' conflicts with a previous declaration
  B_HID_UID_GAM_GAMEPAD_FIRE_JUMP,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:44:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GAMEPAD_FIRE_JUMP'
  B_HID_UID_GAM_GAMEPAD_FIRE_JUMP,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:29,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_vr_controls.h:45:2: error: 
'B_HID_UID_GAM_GAMEPAD_TRIGGER' conflicts with a previous declaration
  B_HID_UID_GAM_GAMEPAD_TRIGGER
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../haiku-git/headers/os/drivers/usb/USB_hid.h:16,
                 from 
../haiku-git/src/add-ons/kernel/drivers/input/usb_hid/HIDDevice.cpp:17:
../haiku-git/headers/os/drivers/usb/USB_hid_page_game_controls.h:45:2: note: 
previous declaration '<unnamed enum> B_HID_UID_GAM_GAMEPAD_TRIGGER'
  B_HID_UID_GAM_GAMEPAD_TRIGGER
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Other related posts: