[Qemu-commits] [qemu/qemu] 38b01a: hw/input/tsc2xxx: Reduce MouseTransformInfo struct...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 38b01a997e6678b4ba86ab12a78a39b7d94ee7d0
      
https://github.com/qemu/qemu/commit/38b01a997e6678b4ba86ab12a78a39b7d94ee7d0
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-21 (Mon, 21 Sep 2020)

  Changed paths:
    M include/hw/input/tsc2xxx.h
    M include/ui/console.h

  Log Message:
  -----------
  hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure

Commit a5d7eb6534a ("Add TSC2301 touchscreen & keypad controller")
added the MouseTransformInfo declaration in "ui/console.h",
however it is only used in "hw/input/tsc2xxx.h".
Reduce the structure exposure by moving it to the single include
where it is used.

This should fix a build failure on OpenBSD:

  In file included from hw/arm/nseries.c:30:
  In file included from include/hw/arm/omap.h:24:
  In file included from include/hw/input/tsc2xxx.h:14:
  include/ui/console.h:11:11: fatal error: 'epoxy/gl.h' file not found
  # include <epoxy/gl.h>
            ^~~~~~~~~~~~
  1 error generated.
  gmake: *** [Makefile.ninja:1735:
  libqemu-aarch64-softmmu.fa.p/hw_arm_nseries.c.o] Error 1

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200907010155.815131-1-f4bug@amsat.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>


  Commit: 0fc0142828b5bc965790a1c5c6e241897d3387cb
      
https://github.com/qemu/qemu/commit/0fc0142828b5bc965790a1c5c6e241897d3387cb
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-22 (Tue, 22 Sep 2020)

  Changed paths:
    M include/hw/input/tsc2xxx.h
    M include/ui/console.h

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/kraxel/tags/input-20200921-pull-request' into staging

input: tsc2xxx fix.

# gpg: Signature made Mon 21 Sep 2020 12:09:17 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/input-20200921-pull-request:
  hw/input/tsc2xxx: Reduce MouseTransformInfo structure exposure

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/edf6ea6fbe79...0fc0142828b5