Changeset 476

Timestamp:

03/24/08 15:45:47 (5 months ago)

Author:

Mike Wey

Message:

string in Loader.d/paths.d conflicts with string in glibtypes

Files:

• trunk/wrap/Loader.d (modified) (2 diffs)
• trunk/wrap/paths.d (modified) (1 diff)

trunk/wrap/Loader.d

@@ -19 +19 @@
-//debug = loadLib;
-//debug = loadSymbol;
+
+private import gtkc.paths;
+version(Tango)
+{
+    private import tango.stdc.stdio;
+    private import tango.io.Stdout;
+    private import gtkc.glibtypes; //For alias char[] string
+}
+else
+{
+    private import std.stdio;
+}
-
-alias void* HANDLE;
@@ -62 +74 @@
-    string  name;       // Name of the exported procedure in dynamic library
-    void**  pointer;    // Address of the procedure pointer variable
-}
-
-private import gtkc.paths;
-version(Tango)
-{
-    private import tango.stdc.stdio;
-    private import tango.io.Stdout;
-    alias char[] string;
-}
-else
-{
-    private import std.stdio;
-}
-

trunk/wrap/paths.d

@@ -12 +12 @@
-module gtkc.paths;
-
-alias char[] string;
+private import gtkc.glibtypes; //For alias char[] string
-
-/*