Permalink
Browse files

fix: issue #2 Current version doesn't build any more (dmd 2.057)

  • Loading branch information...
1 parent ddbedad commit b4a29fa0c9e46c55fd0eade0a8ac3fef071c9b6a @ValeriyBushenev ValeriyBushenev committed Jan 18, 2012
View
0 build-mongoc-binding.sh → build-libmongoc-binding.sh
File renamed without changes.
View
2 build.sh → build-libmongod-32bit.sh
@@ -2,7 +2,7 @@ date
rm *.o
rm *.a
git log -1 --pretty=format:"module myversion; public static char[] author=cast(char[])\"%an\"; public static char[] date=cast(char[])\"%ad\"; public static char[] hash=cast(char[])\"%h\";">myversion.d
-dmd -version=D2 myversion.d src/mongod/*.d -Hdexport/mongod -inline -d -release -lib -oflibmongod-D2
+dmd -m32 -version=D2 myversion.d src/mongod/*.d -Hdexport/mongod -inline -d -release -lib -oflibmongod-D2
dmd -version=D2 -Iexport libmongod-D2.a example/connect.d
View
9 export/mongoc/bson_h.di
@@ -1,5 +1,7 @@
// D import file generated from 'src/mongoc/bson_h.d'
module mongoc.bson_h;
+private import std.string;
+
public static byte BSON_OK = 0;
@@ -61,7 +63,7 @@ struct bson
char* cur;
int dataSize;
bson_bool_t finished;
- long[32] stack;
+ int[32] stack;
int stackPos;
int err;
char* errstr;
@@ -108,8 +110,13 @@ extern (C) int bson_check_field_name(bson* b, char* _string, int length);
extern (C) void bson_builder_error(bson* b);
+extern (C) int bson_append_start_object(bson* b, char* name);
+
extern (C) int bson_append_finish_object(bson* b);
+extern (C) static int bson_append_estart(bson* b, int type, char* name, int dataSize);
+
+
static int _bson_append_string(bson* b, string name, string value)
{
return _bson_append_string_base(b,name,value,bson_type.BSON_STRING);
View
2 export/mongod/md5.di
@@ -4,7 +4,7 @@ private import std.c.stdlib;
private import std.c.string;
-private import std.intrinsic;
+private import core.bitop;
private typedef uint mongo_md5_word_t;
View
4 export/mongod/myversion.di
@@ -3,9 +3,9 @@ module myversion;
public static char[] author = cast(char[])"itiu";
-public static char[] date = cast(char[])"Tue Dec 20 23:15:03 2011 +0400";
+public static char[] date = cast(char[])"Thu Dec 22 21:49:05 2011 +0400";
-public static char[] hash = cast(char[])"70c2de6";
+public static char[] hash = cast(char[])"ddbedad";
View
2 export/mongod/net.di
@@ -8,8 +8,6 @@ private import std.c.stdlib;
private import std.socket;
-private import std.intrinsic;
-
import mongod.mongo_h;
import mongod.bson_h;
int send(Socket sock, void* buf, size_t len, int flags)
View
3 src/mongod/md5.d
@@ -64,7 +64,8 @@ module mongod.md5;
//private import tango.core.BitManip;
private import std.c.stdlib;
private import std.c.string;
-private import std.intrinsic;
+//private import std.intrinsic;
+private import core.bitop;
private typedef uint mongo_md5_word_t; /* 32-bit byte */
private typedef ubyte mongo_md5_byte_t; /* 8-bit byte */
View
2 src/mongod/net.d
@@ -4,7 +4,7 @@ private import std.stdio;
private import std.c.string;
private import std.c.stdlib;
private import std.socket;
-private import std.intrinsic;
+//private import std.intrinsic;
import mongod.mongo_h;
import mongod.bson_h;

0 comments on commit b4a29fa

Please sign in to comment.