From patchwork Mon Oct 12 18:57:08 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Smith, Stan" <stan.smith@intel.com>
X-Patchwork-Id: 53186
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9CJ8P7Z029385
	for <patchwork-linux-rdma@patchwork.kernel.org>;
	Mon, 12 Oct 2009 19:08:26 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757911AbZJLS5z (ORCPT
	<rfc822;patchwork-linux-rdma@patchwork.kernel.org>);
	Mon, 12 Oct 2009 14:57:55 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757912AbZJLS5z
	(ORCPT <rfc822;linux-rdma-outgoing>);
	Mon, 12 Oct 2009 14:57:55 -0400
Received: from mga03.intel.com ([143.182.124.21]:32735 "EHLO mga03.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757911AbZJLS5y (ORCPT <rfc822;linux-rdma@vger.kernel.org>);
	Mon, 12 Oct 2009 14:57:54 -0400
Received: from azsmga001.ch.intel.com ([10.2.17.19])
	by azsmga101.ch.intel.com with ESMTP; 12 Oct 2009 11:57:07 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.44,547,1249282800"; d="scan'208";a="198032180"
Received: from scsmith-mobl1.amr.corp.intel.com (HELO scsmithMOBL1)
	([10.7.151.219])
	by azsmga001.ch.intel.com with ESMTP; 12 Oct 2009 11:57:07 -0700
From: "Stan C. Smith" <stan.smith@intel.com>
To: "'Sasha Khapyorsky'" <sashak@voltaire.com>
Cc: <ofw@lists.openfabrics.org>, "'linux-rdma'" <linux-rdma@vger.kernel.org>
Subject: [PATCH] osmtest - code cleanup
Date: Mon, 12 Oct 2009 11:57:08 -0700
Message-ID: <4BFF1A3398A74B2AABB948EF2843BF68@amr.corp.intel.com>
MIME-Version: 1.0
X-Mailer: Microsoft Office Outlook 11
Thread-Index: AcpLbcwRzRTBxa4qSgaeiBREA0qfWw==
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5579
Sender: linux-rdma-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-rdma.vger.kernel.org>
X-Mailing-List: linux-rdma@vger.kernel.org


diff --git a/opensm/osmtest/osmtest.c b/opensm/osmtest/osmtest.c
index c6ec955..82a814e 100644
--- a/opensm/osmtest/osmtest.c
+++ b/opensm/osmtest/osmtest.c
@@ -43,19 +43,13 @@
  *
  */
 
-#ifdef __WIN__
-#pragma warning(disable : 4996)
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef __WIN__
-#include <complib/cl_timer.h>
-#else
+#ifndef __WIN__
 #include <strings.h>
-#include <sys/time.h>
 #endif
+#include <sys/time.h>
 #include <complib/cl_debug.h>
 #include "osmtest.h"