""

svn path=/trunk/; revision=283

4 files changed, 6 insertions, 6 deletions

diff --git a/externals/grill/pool/data.cpp b/externals/grill/pool/data.cpp
index d2fa2d89..eb5c5bd8 100644
--- a/externals/grill/pool/data.cpp
+++ b/externals/grill/pool/data.cpp
@@ -162,7 +162,7 @@ pooldir *pooldata::CopyAll(const AtomList &d,I depth,BL cut)
 
 static const C *CnvFlnm(C *dst,const C *src,I sz)
 {
-#if defined(PD) && defined(NT)
+#if FLEXT_SYS == FLEXT_SYS_PD && FLEXT_OS == FLEXT_OS_WIN
 	I i,cnt = strlen(src);
 	if(cnt >= sz-1) return NULL;
 	for(i = 0; i < cnt; ++i)
diff --git a/externals/grill/pool/pool.cpp b/externals/grill/pool/pool.cpp
index d7304f57..21eaf279 100644
--- a/externals/grill/pool/pool.cpp
+++ b/externals/grill/pool/pool.cpp
@@ -33,13 +33,13 @@ static I compare(const A &a,const A &b)
 		switch(flext::GetType(a)) {
 		case A_FLOAT:
 			return compare(flext::GetFloat(a),flext::GetFloat(b));
-#ifdef MAXMSP
+#if FLEXT_SYS == FLEXT_SYS_MAX
 		case A_LONG:
 			return compare(flext::GetInt(a),flext::GetInt(b));
 #endif
 		case A_SYMBOL:
 			return compare(flext::GetSymbol(a),flext::GetSymbol(b));
-#ifdef PD
+#if FLEXT_SYS == FLEXT_SYS_PD
 		case A_POINTER:
 			return flext::GetPointer(a) == flext::GetPointer(b)?0:(flext::GetPointer(a) < flext::GetPointer(b)?-1:1);
 #endif
@@ -367,7 +367,7 @@ static C *ReadAtom(C *c,A *a)
 	if(a) {
 		switch(s) {
 		case 0: // integer
-#ifdef MAXMSP
+#if FLEXT_SYS == FLEXT_SYS_MAX
 			flext::SetInt(*a,atoi(m));
 			break;
 #endif
@@ -413,7 +413,7 @@ static V WriteAtom(ostream &os,const A &a)
 	case A_FLOAT:
 		os << a.a_w.w_float;
 		break;
-#ifdef MAXMSP
+#if FLEXT_SYS == FLEXT_SYS_MAX
 	case A_LONG:
 		os << a.a_w.w_long;
 		break;
@@ -447,7 +447,7 @@ BL pooldir::LdDir(istream &is,I depth,BL mkdir)
 				if(nd) {
 					nd->SetVal(k[0],v); v = NULL;
 				}
-	#ifdef _DEBUG
+	#ifdef FLEXT_DEBUG
 				else
 					post("pool - directory was not found",i);
 	#endif
diff --git a/externals/grill/pool/pool.cw b/externals/grill/pool/pool.cw
index 3e596aee..fabf0ff1 100755
--- a/externals/grill/pool/pool.cw
+++ b/externals/grill/pool/pool.cw
diff --git a/externals/grill/pool/pool.help b/externals/grill/pool/pool.help
index 3f160c45..20f96ffa 100755
--- a/externals/grill/pool/pool.help
+++ b/externals/grill/pool/pool.help