diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index 95497a40c..94532969e 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index 1603565b6..8fe62c1c3 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index 97488dd57..b71a5197f 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index fde44043e..fa90de4ce 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index b8aed9d17..08dc3533c 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index 05d2c3956..cca393565 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index d2066e400..15a6d03c6 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index 0af453885..0fbbf6eb0 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index ac4408162..c4ca5315b 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index 9542e47db..f7c37e33a 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index 75d279262..7714f3c9a 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #ifdef WIN32 #include diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index 80f6e5b64..572f74e3d 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index ffc8685c5..b72154f44 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 1f596e6ae..411df8278 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index 25c951858..008081e3c 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -11,8 +11,7 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ - -#include +#include #include #include diff --git a/hw/xnest/meson.build b/hw/xnest/meson.build index e28f34e2c..ef260a13a 100644 --- a/hw/xnest/meson.build +++ b/hw/xnest/meson.build @@ -44,7 +44,6 @@ executable( libxserver_xi_stubs, libxserver_xkb_stubs, ], - c_args: '-DHAVE_XNEST_CONFIG_H', install: true, ) diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h deleted file mode 100644 index c8b3483ed..000000000 --- a/hw/xnest/xnest-config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2005 Red Hat Inc., Raleigh, North Carolina. - * - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation on the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial - * portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#ifndef XNEST_CONFIG_H -#define XNEST_CONFIG_H - -#include - -#endif /* XNEST_CONFIG_H */