From 1591ac2093e781cd51347411aa280b1d4180060e Mon Sep 17 00:00:00 2001
From: fedor <fedor@72102866-910b-0410-8b05-ffd578937521>
Date: Wed, 14 Jul 1999 14:25:02 +0000
Subject: [PATCH] Minor fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4582 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                 |  5 +++++
 Testing/Makefile.preamble |  2 +-
 Testing/create-abbrevs.m  |  2 +-
 Testing/create-regions.m  |  2 +-
 Testing/nstimezone.m      |  6 +++---
 Testing/server.m          |  4 ++--
 Testing/tcpport-server.m  | 12 ++++++------
 7 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50804cecb..3f6085761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 14 10:32:17 1999  Adam Fedor  <fedor@ultra.doc.com>
+
+	* Testing/Makefile.preamble: Fix include path the headers.
+	Other testing fixes
+
 Tue Jul 13 17:08:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSUser.m: Implemented NSStandardApplicationPaths(),
diff --git a/Testing/Makefile.preamble b/Testing/Makefile.preamble
index 655a18d02..89fc2f8bf 100644
--- a/Testing/Makefile.preamble
+++ b/Testing/Makefile.preamble
@@ -45,7 +45,7 @@ ADDITIONAL_OBJCFLAGS = -g
 ADDITIONAL_CFLAGS = 
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS = -I../Source -I../Source/srcdir-include \
+ADDITIONAL_INCLUDE_DIRS = -I../Headers/gnustep -I../Headers \
 	-I../Source/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 
 # Additional LDFLAGS to pass to the linker
diff --git a/Testing/create-abbrevs.m b/Testing/create-abbrevs.m
index 32432c7d1..c241ef5d6 100644
--- a/Testing/create-abbrevs.m
+++ b/Testing/create-abbrevs.m
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
 	    [dict setObject: name forKey: [detail timeZoneAbbreviation]];
 	  e = [dict keyEnumerator];
 	  while ((abbrev = [e nextObject]) != nil)
-	    printf("%@\t%@\n", abbrev, name);
+	    NSLog(@"%@\t%@\n", abbrev, name);
 	}
     }
 
diff --git a/Testing/create-regions.m b/Testing/create-regions.m
index 50524ef81..92dc194dc 100644
--- a/Testing/create-regions.m
+++ b/Testing/create-regions.m
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
 	{
 	  e = [zones[i] objectEnumerator];
 	  while ((name = [e nextObject]) != nil)
-	    printf("%d %@\n", i, name);
+	    NSLog(@"%d %@\n", i, name);
 	}
     }
 
diff --git a/Testing/nstimezone.m b/Testing/nstimezone.m
index 00a75c43b..889f77b79 100644
--- a/Testing/nstimezone.m
+++ b/Testing/nstimezone.m
@@ -12,10 +12,10 @@ main ()
   id detail;
   NSAutoreleasePool	*arp = [NSAutoreleasePool new];
 
-  printf("time zones for PST:\n%@\n",
+  NSLog(@"time zones for PST:\n%@\n",
 	 [[[NSTimeZone abbreviationMap] objectForKey: @"PST"] description]);
-  printf("time zones:\n%@\n", [[NSTimeZone timeZoneArray] description]);
-  printf("local time zone:\n%@\n", [[NSTimeZone localTimeZone] description]);
+  NSLog(@"time zones:\n%@\n", [[NSTimeZone timeZoneArray] description]);
+  NSLog(@"local time zone:\n%@\n", [[NSTimeZone localTimeZone] description]);
   [arp release];
   return 0;
 }
diff --git a/Testing/server.m b/Testing/server.m
index ca5c1ca2e..2206c4a32 100644
--- a/Testing/server.m
+++ b/Testing/server.m
@@ -229,7 +229,7 @@
 - (NSConnection*) connection: ancestor didConnect: newConn
 {
   printf("%s\n", sel_get_name(_cmd));
-  [NSNotificationCenter
+  [[NSNotificationCenter defaultCenter]
     addObserver: self
     selector: @selector(connectionBecameInvalid:)
     name: NSConnectionDidDieNotification
@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
 		    withRootObject:l];
   else
     c = [NSConnection newRegisteringAtName:@"test2server" withRootObject:l];
-  [NSNotificationCenter
+  [[NSNotificationCenter defaultCenter]
     addObserver: l
     selector: @selector(connectionBecameInvalid:)
     name: NSConnectionDidDieNotification
diff --git a/Testing/tcpport-server.m b/Testing/tcpport-server.m
index 7a8e4058d..dbceabda0 100644
--- a/Testing/tcpport-server.m
+++ b/Testing/tcpport-server.m
@@ -8,9 +8,9 @@ id announce_new_connection (id notification)
 {
   id in_port = [notification object];
   id out_port = [notification userInfo];
-  printf ("{%@}\n\tconnected to\n\t{%@}\n",
+  NSLog (@"{%@}\n\tconnected to\n\t{%@}\n",
 	  [out_port description], [in_port description]);
-  printf ("Now servicing %d connection(s).\n",
+  NSLog (@"Now servicing %d connection(s).\n",
 	  [in_port numberOfConnectedOutPorts]);
   return nil;
 }
@@ -19,9 +19,9 @@ id announce_broken_connection (id notification)
 {
   id in_port = [notification object];
   id out_port = [notification userInfo];
-  printf ("{%@}\n\tdisconnected from\n\t{%@}\n",
+  NSLog (@"{%@}\n\tdisconnected from\n\t{%@}\n",
 	  [out_port description], [in_port description]);
-  printf ("Now servicing %d connection(s).\n",
+  NSLog (@"Now servicing %d connection(s).\n",
 	  [in_port numberOfConnectedOutPorts]);
   return nil;
 }
@@ -58,12 +58,12 @@ int main (int argc, char *argv[])
   else
     port = [TcpInPort newForReceivingFromRegisteredName: @"tcpport-test"];
 
-  [NotificationDispatcher
+  [NSNotificationCenter
     addInvocation: [[ObjectFunctionInvocation alloc] 
 		     initWithObjectFunction: announce_broken_connection]
     name: InPortClientBecameInvalidNotification
     object: port];
-  [NotificationDispatcher
+  [NSNotificationCenter
     addInvocation: [[ObjectFunctionInvocation alloc] 
 		     initWithObjectFunction: announce_new_connection]
     name: InPortAcceptedClientNotification