summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Toso <victortoso@redhat.com>2015-12-23 16:56:57 +0100
committerVictor Toso <victortoso@redhat.com>2016-01-07 12:46:42 +0100
commit397eb47816a90c131cdaf92446a08984a9a97dcc (patch)
tree78f8c5e83f2447da8491d4ab4fdf81bfe191a8d2
parentc3f2d217af40fa1da2cb42c69ca4a89fd8e7ef03 (diff)
downloadspice-common-397eb47816a90c131cdaf92446a08984a9a97dcc.tar.gz
spice-common-397eb47816a90c131cdaf92446a08984a9a97dcc.tar.xz
spice-common-397eb47816a90c131cdaf92446a08984a9a97dcc.zip
Remove headers that are included in spice_common.h
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
-rw-r--r--common/backtrace.c5
-rw-r--r--common/canvas_utils.c7
-rw-r--r--common/gl_utils.h1
-rw-r--r--common/glc.c5
-rw-r--r--common/mem.c2
-rw-r--r--common/ogl_ctx.c4
-rw-r--r--common/pixman_utils.c5
-rw-r--r--common/ring.h1
-rw-r--r--common/rop3.c2
9 files changed, 5 insertions, 27 deletions
diff --git a/common/backtrace.c b/common/backtrace.c
index 1b7fab3..6e0d61b 100644
--- a/common/backtrace.c
+++ b/common/backtrace.c
@@ -24,10 +24,9 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "spice_common.h"
#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
@@ -35,8 +34,6 @@
#include <sys/wait.h>
#endif
-#include "spice_common.h"
-
#define GSTACK_PATH "/usr/bin/gstack"
#if HAVE_EXECINFO_H
diff --git a/common/canvas_utils.c b/common/canvas_utils.c
index a3e205f..c5813f4 100644
--- a/common/canvas_utils.c
+++ b/common/canvas_utils.c
@@ -18,14 +18,9 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
-
#include "spice_common.h"
-#include "canvas_utils.h"
-#ifdef __GNUC__
-#include <stdlib.h>
-#include <stdio.h>
-#endif
+#include "canvas_utils.h"
#include "mem.h"
#ifdef WIN32
diff --git a/common/gl_utils.h b/common/gl_utils.h
index 5e50400..b6cc6ce 100644
--- a/common/gl_utils.h
+++ b/common/gl_utils.h
@@ -21,7 +21,6 @@
#ifndef GL_UTILS_H
#define GL_UTILS_H
-#include <spice/macros.h>
#include "spice_common.h"
SPICE_BEGIN_DECLS
diff --git a/common/glc.c b/common/glc.c
index 8fd8700..a792e55 100644
--- a/common/glc.c
+++ b/common/glc.c
@@ -20,12 +20,10 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "spice_common.h"
-#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
#include <math.h>
-#include <spice/macros.h>
#include <GL/gl.h>
#include <GL/glu.h>
@@ -39,7 +37,6 @@
#include "mem.h"
#include "glc.h"
#include "gl_utils.h"
-#include "spice_common.h"
#define TESS_VERTEX_ALLOC_BUNCH 20
diff --git a/common/mem.c b/common/mem.c
index 5f1dbe4..2fda6f3 100644
--- a/common/mem.c
+++ b/common/mem.c
@@ -22,8 +22,6 @@
#include "spice_common.h"
#include "mem.h"
-#include <stdlib.h>
-#include <stdio.h>
#include <string.h>
#ifndef MALLOC_ERROR
diff --git a/common/ogl_ctx.c b/common/ogl_ctx.c
index b4e60fb..2de1b0d 100644
--- a/common/ogl_ctx.c
+++ b/common/ogl_ctx.c
@@ -18,14 +18,12 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "spice_common.h"
-#include <stdlib.h>
-#include <stdio.h>
#include <X11/Xlib.h>
#include <GL/glx.h>
#include "ogl_ctx.h"
-#include "spice_common.h"
enum {
OGLCTX_TYPE_PBUF,
diff --git a/common/pixman_utils.c b/common/pixman_utils.c
index c2161ca..81806c9 100644
--- a/common/pixman_utils.c
+++ b/common/pixman_utils.c
@@ -18,14 +18,11 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "spice_common.h"
#include "pixman_utils.h"
-#include "spice_common.h"
-#include <spice/macros.h>
-#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
#include "mem.h"
/*
diff --git a/common/ring.h b/common/ring.h
index 7fba50e..890e5cd 100644
--- a/common/ring.h
+++ b/common/ring.h
@@ -19,7 +19,6 @@
#ifndef _H_RING2
#define _H_RING2
-#include <spice/macros.h>
#include "spice_common.h"
SPICE_BEGIN_DECLS
diff --git a/common/rop3.c b/common/rop3.c
index 97bfe0c..1a18fe9 100644
--- a/common/rop3.c
+++ b/common/rop3.c
@@ -19,8 +19,6 @@
#include <config.h>
#endif
-#include <stdio.h>
-
#include "rop3.h"
#include "spice_common.h"