From patchwork Wed Oct 24 12:58:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 193792 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8251E2C0079 for ; Thu, 25 Oct 2012 01:01:55 +1100 (EST) Received: from localhost ([::1]:36948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR1Wr-0007Lk-OJ for incoming@patchwork.ozlabs.org; Wed, 24 Oct 2012 10:01:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Zm-0003Db-96 for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:01:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR0Ze-0003TN-T2 for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:00:49 -0400 Received: from mail-da0-f45.google.com ([209.85.210.45]:46181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR0Ze-0002s4-G6 for qemu-devel@nongnu.org; Wed, 24 Oct 2012 09:00:42 -0400 Received: by mail-da0-f45.google.com with SMTP id n15so234236dad.4 for ; Wed, 24 Oct 2012 06:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=1SecHqTApsZTJ+qhHbJrAh3+y1iVfAESMCymaFva70w=; b=WGKBYs/ihgI5igeCdUJKi9XrwFIWXL0hW9ZbwN5w41DOpry2Y1cdOI0pljLYjZ9dmf q+YnPNDijw8paP47Z4Blz8yYK3xmfZTfcwISp+b5d5HnMcn++8KRD7Rie01056mDx+rv 4nQpyOQmt/Srk6elqQ6uGfjWnv3cJna0b5MgS5jo0lfnOgFEBj/MARPo7E/4VTjo/+CS iiGgJW/QjPZUV3drf/iVML5Dxz4G9Z91fiE6V2KtaFKKYDVkbvY1qjkPoV2uA0P7vG7c uUdo76dy1k8u/eEcQvAUftsENnJ3BMpqWEBFQi8x8HNP8IwG0O99AM6zB5oP+TzeaxXJ 7ktg== Received: by 10.68.226.162 with SMTP id rt2mr49455753pbc.62.1351083641747; Wed, 24 Oct 2012 06:00:41 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id n7sm9466138pav.26.2012.10.24.06.00.38 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Oct 2012 06:00:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 24 Oct 2012 14:58:49 +0200 Message-Id: <1351083542-15272-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> References: <1351083542-15272-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: peter.maydell@linaro.org, aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 19/32] slirp: move public header file to include/slirp/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- {slirp => include/slirp}/libslirp.h | 5 +++++ main-loop.c | 2 +- slirp/misc.c | 1 - slirp/slirp.h | 7 +------ 4 files changed, 7 insertions(+), 8 deletions(-) rename {slirp => include/slirp}/libslirp.h (96%) diff --git a/slirp/libslirp.h b/include/slirp/libslirp.h similarity index 96% rename from slirp/libslirp.h rename to include/slirp/libslirp.h index 9b471b5..ee4ef7b 100644 --- a/slirp/libslirp.h +++ b/include/slirp/libslirp.h @@ -3,6 +3,11 @@ #include "qemu-common.h" +#ifndef _WIN32 +#include +#include +#endif + struct Slirp; typedef struct Slirp Slirp; diff --git a/main-loop.c b/main-loop.c index eb3b6e6..154aa5e 100644 --- a/main-loop.c +++ b/main-loop.c @@ -24,7 +24,7 @@ #include "qemu-common.h" #include "qemu-timer.h" -#include "slirp/slirp.h" +#include "slirp/libslirp.h" #include "main-loop.h" #ifndef _WIN32 diff --git a/slirp/misc.c b/slirp/misc.c index 0bee864..bb1e998 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -6,7 +6,6 @@ */ #include -#include #include "monitor.h" diff --git a/slirp/slirp.h b/slirp/slirp.h index f2c5eca..acd0276 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -66,11 +66,6 @@ typedef char *caddr_t; #include #endif -#ifndef _WIN32 -#include -#include -#endif - /* Systems lacking strdup() definition in . */ #if defined(ultrix) char *strdup(const char *); @@ -136,7 +131,7 @@ void free(void *ptr); #include "qemu-queue.h" #include "qemu_socket.h" -#include "libslirp.h" +#include "slirp/libslirp.h" #include "ip.h" #include "tcp.h" #include "tcp_timer.h"