Merge pull request #94 from zanedp/win32-clang-weak-workaround

New macros for controlling use of weak linkage (Thanks Zane!)

src/unity.c

@@ -1101,12 +1101,17 @@ void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
 }
 
 //-----------------------------------------------
-#ifdef UNITY_SUPPORT_WEAK
-UNITY_WEAK void setUp(void) { }
-UNITY_WEAK void tearDown(void) { }
+#if defined(UNITY_WEAK_ATTRIBUTE)
+    UNITY_WEAK_ATTRIBUTE void setUp(void) { }
+    UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
+#elif defined(UNITY_WEAK_PRAGMA)
+#   pragma weak setUp
+    void setUp(void);
+#   pragma weak tearDown
+    void tearDown(void);
 #else
-void setUp(void);
-void tearDown(void);
+    void setUp(void);
+    void tearDown(void);
 #endif
 //-----------------------------------------------
 void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)

src/unity_internals.h

@@ -292,22 +292,19 @@ extern int UNITY_OUTPUT_CHAR(int);
 //-------------------------------------------------------
 // Language Features Available
 //-------------------------------------------------------
-
-#ifdef __GNUC__
-#define UNITY_SUPPORT_WEAK __attribute__((weak))
+#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
+#   ifdef __GNUC__ // includes clang
+#       if !(defined(__WIN32__) && defined(__clang__))
+#           define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
+#       endif
+#   endif
 #endif
 
-#ifdef __clang__
-#define UNITY_SUPPORT_WEAK __attribute__((weak))
+#ifdef UNITY_NO_WEAK
+#   undef UNITY_WEAK_ATTRIBUTE
+#   undef UNITY_WEAK_PRAGMA
 #endif
 
-#ifndef UNITY_WEAK
-#ifdef UNITY_SUPPORT_WEAK
-#define UNITY_WEAK UNITY_SUPPORT_WEAK
-#else
-#define UNITY_WEAK
-#endif
-#endif
 
 //-------------------------------------------------------
 // Internal Structs Needed