Changes from Mark Kettenis. See ChangeLog Mar 23

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2304 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mccallum 1997-05-03 18:13:17 +00:00
parent ef23424eac
commit 8587a2d6ee
4 changed files with 28 additions and 8 deletions

View file

@ -676,10 +676,10 @@ include/o_map.h: include/o_map_bas.h include/o_map_cbs.h include/o_hash.h
Makefile: $(srcdir)/Makefile.in ../config.status
cd ..; $(SHELL) config.status
../config.status:
cd ..; $(SHELL) configure --no-create
include/config.h.in: $(srcdir)/../configure.in $(srcdir)/../acconfig.h
cd ..; $(SHELL) autoheader
include/config.h: include/config.h.in
cd ..; $(SHELL) $(srcdir)/configure --no-create
$(srcdir)/include/config.h.in: $(srcdir)/../configure.in $(srcdir)/../acconfig.h
cd $(srcdir)/..; $(SHELL) autoheader
include/config.h: $(srcdir)/include/config.h.in
TAGS: $(DIST_FILES)
etags $(DIST_FILES)

View file

@ -65,10 +65,9 @@
#ifndef __WIN32__
volatile NSTimeInterval interval;
struct timeval tp;
struct timezone tzp;
interval = UNIX_REFERENCE_INTERVAL;
gettimeofday (&tp, &tzp);
gettimeofday (&tp, NULL);
interval += tp.tv_sec;
interval += (double)tp.tv_usec / 1000000.0;
@ -262,6 +261,11 @@
return seconds_since_ref - UNIX_REFERENCE_INTERVAL;
}
- (NSTimeInterval) timeIntervalSince1970
{
return seconds_since_ref - UNIX_REFERENCE_INTERVAL;
}
- (NSTimeInterval) timeIntervalSinceDate: (NSDate*)otherDate
{
return seconds_since_ref - [otherDate timeIntervalSinceReferenceDate];
@ -301,7 +305,7 @@
- (BOOL) isEqual: (id)other
{
if ([other isKindOf: [NSDate class]]
&& 1.0 > (seconds_since_ref - [other timeIntervalSinceReferenceDate]))
&& 1.0 > ABS(seconds_since_ref - [other timeIntervalSinceReferenceDate]))
return YES;
return NO;
}