From: Michael D. Lowis <mike.lowis@gentex.com>
Date: Wed, 20 Aug 2014 12:42:30 +0000 (-0400)
Subject: Merge changes from dev
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=bf9782e40229d49d10bcdc73872e5e2d3f437c21;p=projs%2Flibcds.git

Merge changes from dev
---

bf9782e40229d49d10bcdc73872e5e2d3f437c21
diff --cc Rakefile
index 40fee44,2d842cd..4fce26f
--- a/Rakefile
+++ b/Rakefile
@@@ -13,14 -13,14 +13,10 @@@ require 'rbconfig
  #------------------------------------------------------------------------------
  # Envrionment Definitions
  #------------------------------------------------------------------------------
--# Detect the windows platform and provide a task to force posix
--is_windows = (Object.const_get('RUBY_PLATFORM') =~ /mswin|mingw|cygwin/)
--task(:posix){ is_windows = false }
--
  # Define the compiler environment
  Env = Rscons::Environment.new do |env|
 -  env.build_dir('source','build/obj/source')
 -  env["CFLAGS"] += ['-Wall', '-Wextra', '-Werror']
 +  env.build_dir('source/','build/obj/source')
 +  env["CFLAGS"] += ['--std=c99', '-Wall', '-Wextra', '-Werror']
    env['CPPPATH'] += Dir['source/**/']
  end
  
diff --cc tests/main.c
index 8e12161,5c68846..b22a93a
--- a/tests/main.c
+++ b/tests/main.c
@@@ -7,6 -7,6 +7,7 @@@ int main(int argc, char** argv
      RUN_TEST_SUITE(Vector);
      RUN_TEST_SUITE(List);
      RUN_TEST_SUITE(Buffer);
 +    RUN_TEST_SUITE(String);
+     RUN_TEST_SUITE(RBT);
      return PRINT_TEST_RESULTS();
  }