0
@@ -204,10 +204,44 @@ module JFFI
0
 
0
   # Use for a C struct with a char [] embedded inside.
0
   add_typedef(NativeType::CHAR_ARRAY, :char_array)
0
-  
0
+
0
+  # Load all the platform dependent types/consts/struct members
0
+  class Config
0
+    CONFIG = Hash.new
0
+    begin
0
+      File.open(File.join(Platform::CONF_DIR, 'platform.conf'), "r") do |f|
0
+        typedef = "rbx.platform.typedef."
0
+        f.each_line { |line|
0
+          if line.index(typedef) == 0
0
+            new_type, orig_type = line.chomp.slice(typedef.length..-1).split(/\s*=\s*/)
0
+            JFFI.add_typedef(orig_type.to_sym, new_type.to_sym)
0
+          else
0
+            key, value = line.chomp.split(/\s*=\s*/)
0
+            puts "key=#{key} value=#{value}"
0
+            CONFIG[key] = value
0
+          end
0
+        }
0
+      end
0
+    rescue Errno::ENOENT
0
+    end
0
+    def self.[](name)
0
+
0
+    end
0
+  end
0
   # Load all the platform dependent types
0
-  require "ffi/platform/#{Config::CONFIG['host_os']}"
0
-  PlatformTypes.each_pair { |k, v| add_typedef(v.to_sym, k.to_sym) }
0
+  begin
0
+    File.open(File.join(Platform::CONF_DIR, 'types.conf'), "r") do |f|
0
+      prefix = "rbx.platform.typedef."
0
+      f.each_line { |line|
0
+        if line.index(prefix) == 0
0
+          new_type, orig_type = line.chomp.slice(prefix.length..-1).split(/\s*=\s*/)
0
+#          puts "new type=#{new_type} orig_type=#{orig_type}"
0
+          add_typedef(orig_type.to_sym, new_type.to_sym)
0
+        end
0
+      }
0
+    end
0
+  rescue Errno::ENOENT
0
+  end
0
   
0
   TypeSizes = {
0
     1 => :char,
0
@@ -583,7 +617,7 @@ class FFI::Struct < JFFI::BaseStruct
0
   end
0
 
0
   def self.config(base, *fields)
0
-    config = Config::CONFIG
0
+    config = JFFI::Config::CONFIG
0
     @size = config["#{base}.sizeof"]
0
     
0
     builder = JFFI::StructLayoutBuilder.new

0
@@ -41,5 +41,13 @@ module JFFI
0
     IS_SOLARIS = OS_NAME_LC.index(SOLARIS) == 0
0
     IS_BSD = IS_MAC || IS_FREEBSD
0
     ARCH = java.lang.System.getProperty("os.arch")
0
+    NAME = if IS_WINDOWS
0
+      "#{ARCH}-windows"
0
+    elsif IS_MAC
0
+      "darwin"
0
+    elsif IS_FREEBSD
0
+      "#{ARCH}-freebsd"
0
+    end
0
+    CONF_DIR = File.join(File.dirname(__FILE__), "platform", NAME)
0
   end
0
 end
0
\ No newline at end of file