Do not check for HAVE_CONFIG_H

This should always be defined and including config.h is a requirement. Signed-off-by: Frediano Ziglio <fziglio@redhat.com> Acked-by: Victor Toso <victortoso@redhat.com>
2026-01-09 05:34:12 +00:00 · 2019-05-01 10:12:14 +01:00 · 2019-05-01 10:12:14 +01:00 · 4fc4c2db36
commit 4fc4c2db36
parent 09fba0677d
25 changed files with 1 additions and 50 deletions
--- a/common/backtrace.c
+++ b/common/backtrace.c
@ -21,9 +21,7 @@
 * Copyright (C) 2008 Red Hat, Inc.
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "backtrace.h"

--- a/common/canvas_base.c
+++ b/common/canvas_base.c
@ -16,9 +16,7 @@
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <stdarg.h>
 #include <stdlib.h>
--- a/common/canvas_utils.c
+++ b/common/canvas_utils.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "canvas_utils.h"
 #include "mem.h"
--- a/common/lines.c
+++ b/common/lines.c
@ -45,9 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.

 ******************************************************************/
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <stdio.h>
 #include <spice/macros.h>
--- a/common/log.c
+++ b/common/log.c
@ -15,9 +15,7 @@
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <glib.h>
 #include <stdlib.h>
--- a/common/lz.c
+++ b/common/lz.c
@ -43,9 +43,7 @@
   SOFTWARE.

 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "lz.h"

--- a/common/lz_compress_tmpl.c
+++ b/common/lz_compress_tmpl.c
@ -40,9 +40,7 @@
   SOFTWARE.

 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #define DJB2_START 5381
 #define DJB2_HASH(hash, c) (hash = ((hash << 5) + hash) ^ (c)) //|{hash = ((hash << 5) + hash) + c;}
--- a/common/lz_decompress_tmpl.c
+++ b/common/lz_decompress_tmpl.c
@ -59,9 +59,7 @@
    COPY_COMP_PIXEL(encoder, out) - copies pixel from the compressed buffer to the decompressed
                                    buffer. Increases out.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #if !defined(LZ_RGB_ALPHA)
 #define COPY_PIXEL(p, out) (*out++ = p)
--- a/common/marshaller.c
+++ b/common/marshaller.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "log.h"
 #include "marshaller.h"
--- a/common/mem.c
+++ b/common/mem.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "mem.h"

--- a/common/pixman_utils.c
+++ b/common/pixman_utils.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "pixman_utils.h"

--- a/common/quic.c
+++ b/common/quic.c
@ -19,9 +19,7 @@
 // Red Hat image compression based on SFALIC by Roman Starosolski
 // http://sun.iinf.polsl.gliwice.pl/~rstaros/sfalic/index.html

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <glib.h>

--- a/common/quic_family_tmpl.c
+++ b/common/quic_family_tmpl.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #ifdef QUIC_FAMILY_8BPC
 #undef QUIC_FAMILY_8BPC
--- a/common/quic_tmpl.c
+++ b/common/quic_tmpl.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #define COMPRESS_IMP

--- a/common/region.c
+++ b/common/region.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <stdio.h>
 #include <string.h>
--- a/common/rop3.c
+++ b/common/rop3.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "rop3.h"

--- a/common/ssl_verify.c
+++ b/common/ssl_verify.c
@ -16,9 +16,7 @@
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "mem.h"
 #include "ssl_verify.h"
--- a/common/sw_canvas.c
+++ b/common/sw_canvas.c
@ -15,12 +15,10 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #ifdef __MINGW32__
 #undef HAVE_STDLIB_H
 #endif
 #include <config.h>
-#endif

 #include <math.h>
 #include "sw_canvas.h"
--- a/common/utils.c
+++ b/common/utils.c
@ -16,9 +16,7 @@
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */

-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include "utils.h"

--- a/meson.build
+++ b/meson.build
@ -10,8 +10,7 @@ if not meson.is_subproject()
 endif

 # some global vars
-spice_common_global_cflags = ['-DHAVE_CONFIG_H',
-                              '-DG_LOG_DOMAIN="Spice"',
+spice_common_global_cflags = ['-DG_LOG_DOMAIN="Spice"',
                              '-Wall',
                              '-Wextra',
                              '-Werror',
--- a/spice_codegen.py
+++ b/spice_codegen.py
@ -311,9 +311,7 @@ writer.write(license)
 writer.header.writeln("/* this is a file autogenerated by spice_codegen.py */")
 writer.header.write(license)
 if not options.generate_enums:
-    writer.writeln("#ifdef HAVE_CONFIG_H")
    writer.writeln("#include <config.h>")
-    writer.writeln("#endif")

 if options.assert_on_error:
    writer.set_option("assert_on_error")
--- a/tests/test-logging.c
+++ b/tests/test-logging.c
@ -14,9 +14,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #define G_LOG_DOMAIN "Spice"

--- a/tests/test-marshallers.c
+++ b/tests/test-marshallers.c
@ -14,9 +14,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <glib.h>
 #include <string.h>
--- a/tests/test-quic.c
+++ b/tests/test-quic.c
@ -14,9 +14,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
--- a/tests/test-region.c
+++ b/tests/test-region.c
@ -15,9 +15,7 @@
   You should have received a copy of the GNU Lesser General Public
   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif

 #include <stdio.h>
 #include <string.h>