Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/libntfs
In directory usw-pr-cvs1:/tmp/cvs-serv15003/libntfs
Modified Files:
Makefile.am Makefile.in ntfsd.c
Log Message:
Makefile updates.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.am 2001/03/26 03:46:56 1.4
+++ Makefile.am 2001/04/07 00:53:37 1.5
@@ -20,5 +20,6 @@
disk_io.c \
ntfs_rec.c \
- unistr.c
+ unistr.c \
+ ntfsd.c
INCLUDES = $(linux_ntfsincludedir) $(all_includes)
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Makefile.in 2001/04/02 02:04:37 1.3
+++ Makefile.in 2001/04/07 00:53:37 1.4
@@ -96,5 +96,5 @@
lib_LTLIBRARIES = libntfs.la
libntfs_la_LDFLAGS = -version-info $(LTVERSION)
-libntfs_la_SOURCES = attrib.c bootsect.c bitmap.c mft.c volume.c disk_io.c ntfs_rec.c unistr.c
+libntfs_la_SOURCES = attrib.c bootsect.c bitmap.c mft.c volume.c disk_io.c ntfs_rec.c unistr.c ntfsd.c
@@ -110,5 +110,5 @@
libntfs_la_LIBADD =
libntfs_la_OBJECTS = attrib.lo bootsect.lo bitmap.lo mft.lo volume.lo \
-disk_io.lo ntfs_rec.lo unistr.lo
+disk_io.lo ntfs_rec.lo unistr.lo ntfsd.lo
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -123,6 +123,6 @@
GZIP_ENV = --best
DEP_FILES = .deps/attrib.P .deps/bitmap.P .deps/bootsect.P \
-.deps/disk_io.P .deps/mft.P .deps/ntfs_rec.P .deps/unistr.P \
-.deps/volume.P
+.deps/disk_io.P .deps/mft.P .deps/ntfs_rec.P .deps/ntfsd.P \
+.deps/unistr.P .deps/volume.P
SOURCES = $(libntfs_la_SOURCES)
OBJECTS = $(libntfs_la_OBJECTS)
Index: ntfsd.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/libntfs/ntfsd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- ntfsd.c 2001/04/07 00:45:49 1.1
+++ ntfsd.c 2001/04/07 00:53:38 1.2
@@ -22,7 +22,4 @@
*/
-#include <unistd.h>
-#include <stdlib.h>
-
#include <linux/bitops.h>
#include <sys/time.h>
@@ -113,4 +110,5 @@
return FALSE;
}
+ // Set the timer.
goto unl_ret_true;
}
@@ -131,4 +129,5 @@
return TRUE;
}
+ // Stop the timer.
tries = 0;
retry_set_action:
|
