Merge branch 'master' of github.com:randym/axlsx

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/axlsx/workbook/workbook.rb b/lib/axlsx/workbook/workbook.rb
index edb02d81..ea733a4f 100644
--- a/lib/axlsx/workbook/workbook.rb
+++ b/lib/axlsx/workbook/workbook.rb
@@ -89,10 +89,15 @@ require 'axlsx/workbook/worksheet/worksheet.rb'
       @drawings = SimpleTypedList.new Drawing
       @charts = SimpleTypedList.new Chart
       @images = SimpleTypedList.new Pic
-      self.date1904= options[:date1904] unless options[:date1904].nil?
+      self.date1904= options[:date1904].nil? ? is_bsd? : options[:date1904]
       yield self if block_given?      
     end
 
+    def is_bsd?
+      platform = RUBY_PLATFORM.downcase
+      platform.include?('freebsd') || platform.include?('darwin')
+    end
+
     # Instance level access to the class variable 1904
     # @return [Boolean]
     def date1904() @@date1904; end