[27/37] sh4: Clean up includes

Commit Message

Peter Maydell Jan. 26, 2016, 6:17 p.m. UTC

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <[e-mail]>
---
 disas/sh4.c              | 2 +-
 hw/sh4/r2d.c             | 1 +
 hw/sh4/sh7750.c          | 2 +-
 hw/sh4/sh7750_regnames.c | 1 +
 hw/sh4/sh_pci.c          | 1 +
 hw/sh4/shix.c            | 1 +
 target-sh4/cpu.c         | 1 +
 target-sh4/gdbstub.c     | 2 +-
 target-sh4/helper.c      | 6 +-----
 target-sh4/monitor.c     | 1 +
 target-sh4/op_helper.c   | 2 +-
 target-sh4/translate.c   | 1 +
 12 files changed, 12 insertions(+), 9 deletions(-)

Patch

diff --git a/disas/sh4.c b/disas/sh4.c
index 020f5eb..8b0415d 100644
--- a/disas/sh4.c
+++ b/disas/sh4.c
@@ -15,7 +15,7 @@ 
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include "disas/bfd.h"
 
 #define DEFINE_TABLE
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index c1ff9a0..7d9a1cd 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -23,6 +23,7 @@ 
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 5dda5de..a1ea760 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -22,7 +22,7 @@ 
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdio.h>
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sysemu/sysemu.h"
diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c
index 52ac1cc..34b4f99 100644
--- a/hw/sh4/sh7750_regnames.c
+++ b/hw/sh4/sh7750_regnames.c
@@ -1,3 +1,4 @@ 
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sh7750_regs.h"
diff --git a/hw/sh4/sh_pci.c b/hw/sh4/sh_pci.c
index 4509053..e820a32 100644
--- a/hw/sh4/sh_pci.c
+++ b/hw/sh4/sh_pci.c
@@ -21,6 +21,7 @@ 
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/sh4/sh.h"
 #include "hw/pci/pci.h"
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index d508be9..386a485 100644
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -27,6 +27,7 @@ 
 
    More information in target-sh4/README.sh4
 */
+#include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sysemu/sysemu.h"
diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c
index d7e2fbd..8621d70 100644
--- a/target-sh4/cpu.c
+++ b/target-sh4/cpu.c
@@ -19,6 +19,7 @@ 
  * <http://www.gnu.org/licenses/lgpl-2.1.html>
  */
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
diff --git a/target-sh4/gdbstub.c b/target-sh4/gdbstub.c
index a365a27..1b59ea8 100644
--- a/target-sh4/gdbstub.c
+++ b/target-sh4/gdbstub.c
@@ -17,7 +17,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/>.
  */
-#include "config.h"
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "exec/gdbstub.h"
 
diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index eaececd..9d8b61c 100644
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -16,11 +16,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/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
+#include "qemu/osdep.h"
 
 #include "cpu.h"
 
diff --git a/target-sh4/monitor.c b/target-sh4/monitor.c
index a06f0d4..426e5d4 100644
--- a/target-sh4/monitor.c
+++ b/target-sh4/monitor.c
@@ -21,6 +21,7 @@ 
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "monitor/monitor.h"
 #include "monitor/hmp-target.h"
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index a312118..368e687 100644
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -16,7 +16,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/>.
  */
-#include <stdlib.h>
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 7bc6216..9de5659 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -19,6 +19,7 @@ 
 
 #define DEBUG_DISAS
 
+#include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
 #include "tcg-op.h"