[Themis-devcvs] SF.net SVN: themis:[729] trunk/themis/common/ColorTools.h

[CVS C. to T. <the...@li...>]

Revision: 729
          http://sourceforge.net/p/themis/code/729
Author:   mark_hellegers
Date:     2016-03-05 16:43:45 +0000 (Sat, 05 Mar 2016)
Log Message:
-----------
Make Themis compile on recent versions of Haiku again.

Modified Paths:
--------------
    trunk/themis/common/ColorTools.h

Modified: trunk/themis/common/ColorTools.h
===================================================================
--- trunk/themis/common/ColorTools.h	2016-03-05 16:27:49 UTC (rev 728)
+++ trunk/themis/common/ColorTools.h	2016-03-05 16:43:45 UTC (rev 729)
@@ -76,13 +76,13 @@
 	c.alpha = alpha;
 	return c;
 }
-#endif
 
 // Mix two colors together, ignoring their relative alpha channels.
 // If amount is 0, the result is color1; if 255, the result is color2;
 // if another value, it is somewhere in-between.  The resulting alpha
 // channel is mixed exactly like the other color channels.
 rgb_color mix_color(rgb_color color1, rgb_color color2, uint8 amount);
+#endif
 
 // Blend two colors together, weighting by their relative alpha channels.
 // The resulting color is the same as mix_color(), except that the amount

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.