r6334: revert 3.0.15pre1 changes. roll back to 3.0.14.

Add in jra fix for bad SMB_ASSERT. 

Redefine SMB_ASSERT to a single DEBUG()
when not using --with-developer

2 files changed, 4 insertions, 4 deletions

diff --git a/source/torture/torture.c b/source/torture/torture.c
index 8a4de57e7ff..b37a30cf2e3 100644
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -590,7 +590,7 @@ static BOOL run_readwritelarge(int dummy)
 	static struct cli_state *cli1;
 	int fnum1;
 	const char *lockfname = "\\large.dat";
-	SMB_OFF_T fsize;
+	size_t fsize;
 	char buf[126*1024];
 	BOOL correct = True;
  
@@ -2360,7 +2360,7 @@ static BOOL run_trans2test(int dummy)
 {
 	struct cli_state *cli;
 	int fnum;
-	SMB_OFF_T size;
+	size_t size;
 	time_t c_time, a_time, m_time, w_time, m_time2;
 	const char *fname = "\\trans2.tst";
 	const char *dname = "\\trans2";
@@ -3591,7 +3591,7 @@ static BOOL run_opentest(int dummy)
 	const char *fname = "\\readonly.file";
 	int fnum1, fnum2;
 	char buf[20];
-	SMB_OFF_T fsize;
+	size_t fsize;
 	BOOL correct = True;
 	char *tmp_path;
 
diff --git a/source/torture/utable.c b/source/torture/utable.c
index c9b30f06e1c..ba803a0da4f 100644
--- a/source/torture/utable.c
+++ b/source/torture/utable.c
@@ -137,7 +137,7 @@ BOOL torture_casetable(int dummy)
 	}
 
 	for (c=1; c < 0x10000; c++) {
-		SMB_OFF_T size;
+		size_t size;
 
 		if (c == '.' || c == '\\') continue;