1.1 --- a/test/TestUtils.cpp	Mon Sep 28 23:39:08 2009 -0700
     1.2 +++ b/test/TestUtils.cpp	Tue Sep 29 15:46:42 2009 -0700
     1.3 @@ -25,7 +25,7 @@
     1.4      
     1.5      void shuffle(int a[], int n, unsigned seed) {
     1.6          if (seed==0) {
     1.7 -#ifdef BSD
     1.8 +#ifdef _DARWIN_C_SOURCE
     1.9              srandomdev();
    1.10  #endif
    1.11              seed = random();
    1.12 @@ -54,16 +54,11 @@
    1.13              while (NULL != ::fgets(word, 4096, in)) {
    1.14                  wordLen = ::strlen(word);
    1.15                  if (word[wordLen-1]=='\n') {
    1.16 -		  word[wordLen-1] = '\0';
    1.17 -		  wordLen--;
    1.18 -		}
    1.19 -
    1.20 -                if (wordLen == 0) continue;
    1.21 -
    1.22 -                sWords[sNWords] = strdup(word); 
    1.23 -                //if( sNWords % 10000 == 0)
    1.24 -                //    printf("'%s' ... ", sWords[sNWords]->string());
    1.25 -                sNWords++;
    1.26 +                    word[wordLen-1] = '\0';
    1.27 +                    wordLen--;
    1.28 +                }
    1.29 +                if (wordLen > 0)
    1.30 +                    sWords[sNWords++] = strdup(word); 
    1.31              }
    1.32          }
    1.33      }
    1.34 @@ -99,7 +94,7 @@
    1.35  using namespace Mooseyard;
    1.36  
    1.37  int main(int argc, char **argv) {
    1.38 -#if BSD
    1.39 +#ifdef _DARWIN_C_SOURCE
    1.40      srandomdev();
    1.41  #endif
    1.42      try {