From 34f5247d76ac5362e2a7d18b5986faca8ab8e601 Mon Sep 17 00:00:00 2001
From: Joel Nordell <joel.nordell@erisfutures.com>
Date: Thu, 28 Jan 2016 12:06:13 -0600
Subject: [PATCH] rename fa::linux to fa::_linux to avoid name conflict with
 linux system #defines

---
 QtAwesome/QtAwesome.cpp | 2 +-
 QtAwesome/QtAwesome.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/QtAwesome/QtAwesome.cpp b/QtAwesome/QtAwesome.cpp
index 23b0ac5..df2bd4c 100644
--- a/QtAwesome/QtAwesome.cpp
+++ b/QtAwesome/QtAwesome.cpp
@@ -568,7 +568,7 @@ bool QtAwesome::initFontAwesome( )
     m.insert("link", fa::link );
     m.insert("linkedin", fa::linkedin );
     m.insert("linkedinsquare", fa::linkedinsquare );
-    m.insert("linux", fa::linux );
+    m.insert("linux", fa::_linux );
     m.insert("list", fa::list );
     m.insert("listalt", fa::listalt );
     m.insert("listol", fa::listol );
diff --git a/QtAwesome/QtAwesome.h b/QtAwesome/QtAwesome.h
index eff6735..279870b 100644
--- a/QtAwesome/QtAwesome.h
+++ b/QtAwesome/QtAwesome.h
@@ -391,7 +391,7 @@ namespace fa {
       link                 = 0xf0c1,
       linkedin             = 0xf0e1,
       linkedinsquare       = 0xf08c,
-      linux                = 0xf17c,
+      _linux               = 0xf17c,
       list                 = 0xf03a,
       listalt              = 0xf022,
       listol               = 0xf0cb,