From ce906161febf76ee2d493cfed9cd8f4c29a95ef9 Mon Sep 17 00:00:00 2001
From: Gilles Gouaillardet <gilles.gouaillardet@iferc.org>
Date: Tue, 12 Aug 2014 12:32:35 +0900
Subject: [PATCH] Silence warning on Solaris.

Ensure the hwloc_solaris_get_chip_type and hwloc_solaris_get_chip_model
macros are defined before the prototype is defined.
---
 src/topology-solaris-chiptype.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/topology-solaris-chiptype.c b/src/topology-solaris-chiptype.c
index 11bbf5e8bd..8c5e956916 100644
--- a/src/topology-solaris-chiptype.c
+++ b/src/topology-solaris-chiptype.c
@@ -1,6 +1,8 @@
 /*
  * Copyright (c) 2009-2010 Oracle and/or its affiliates.  All rights reserved. 
- * Copyright (c) 2013 Université Bordeaux 1.  All rights reserved.
+ * Copyright (c) 2013      Université Bordeaux 1.  All rights reserved.
+ * Copyright (c) 2014      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  *
  * $COPYRIGHT$
  * 
@@ -11,8 +13,8 @@
 
 #include <private/autogen/config.h>
 #include <hwloc/autogen/config.h>
-#include <private/solaris-chiptype.h>
 #include <hwloc.h>
+#include <private/solaris-chiptype.h>
 #include <stdlib.h>
 #include <strings.h>