From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Joachim Schmitz" Subject: [PATCH v6 2/4] fix some win32 specific dependencies in poll.c Date: Mon, 17 Sep 2012 08:56:28 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset="iso-8859-1"; reply-type=response Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Sep 17 09:01:00 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TDVKC-00030o-Fw for gcvg-git-2@plane.gmane.org; Mon, 17 Sep 2012 09:00:56 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752110Ab2IQHAq (ORCPT ); Mon, 17 Sep 2012 03:00:46 -0400 Received: from plane.gmane.org ([80.91.229.3]:58226 "EHLO plane.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751268Ab2IQHAI (ORCPT ); Mon, 17 Sep 2012 03:00:08 -0400 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1TDVJL-0002es-Qd for git@vger.kernel.org; Mon, 17 Sep 2012 09:00:03 +0200 Received: from dsdf-4db53772.pool.mediaways.net ([77.181.55.114]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Sep 2012 09:00:03 +0200 Received: from jojo by dsdf-4db53772.pool.mediaways.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Sep 2012 09:00:03 +0200 X-Injected-Via-Gmane: http://gmane.org/ X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: dsdf-4db53772.pool.mediaways.net X-Newsreader: Microsoft Outlook Express 6.00.2900.5931 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: In order for non-win32 platforms to be able to use poll.c, #ifdef the inclusion of two header files in the same manner as it's done elsewhere in git. Signed-off-by: Joachim Schmitz --- compat/poll/poll.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compat/poll/poll.c b/compat/poll/poll.c index 9e7a25c..e4b8319 100644 --- a/compat/poll/poll.c +++ b/compat/poll/poll.c @@ -24,7 +24,9 @@ # pragma GCC diagnostic ignored "-Wtype-limits" #endif -#include +#if defined(WIN32) +# include +#endif #include @@ -48,7 +50,9 @@ #else # include # include -# include +# ifndef NO_SYS_SELECT_H +# include +# endif # include #endif -- 1.7.12