Page MenuHomeFreeBSD
Files F167493491

D39994.id121960.diff
No OneTemporary
Actions

D39994.id121960.diff
View Options

diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile
--- a/lib/libcompat/Makefile
+++ b/lib/libcompat/Makefile
@@ -8,12 +8,7 @@
WARNS?= 0
-.PATH: ${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4
-
-# compat 4.1 sources
-SRCS+= ftime.c
-
-MAN+= 4.1/ftime.3
+.PATH: ${.CURDIR}/4.3 ${.CURDIR}/4.4
# compat 4.3 sources
SRCS+= re_comp.c rexec.c
diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -13,7 +13,7 @@
SHLIB_MAJOR= 9
SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c \
- getlocalbase.c gr_util.c \
+ ftime.c getlocalbase.c gr_util.c \
hexdump.c humanize_number.c kinfo_getfile.c \
kinfo_getallproc.c kinfo_getproc.c kinfo_getvmmap.c \
kinfo_getvmobject.c kld.c \
@@ -31,8 +31,8 @@
CFLAGS+= -I${.CURDIR} -I${SRCTOP}/lib/libc/gen/
-MAN+= expand_number.3 flopen.3 fparseln.3 getlocalbase.3 hexdump.3 \
- humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
+MAN+= expand_number.3 flopen.3 fparseln.3 ftime.3 getlocalbase.3 \
+ hexdump.3 humanize_number.3 kinfo_getallproc.3 kinfo_getfile.3 \
kinfo_getproc.3 kinfo_getvmmap.3 kinfo_getvmobject.3 kld.3 \
login_auth.3 login_cap.3 \
login_class.3 login_ok.3 login_times.3 login_tty.3 pidfile.3 \
diff --git a/lib/libcompat/4.1/ftime.3 b/lib/libutil/ftime.3
rename from lib/libcompat/4.1/ftime.3
rename to lib/libutil/ftime.3
--- a/lib/libcompat/4.1/ftime.3
+++ b/lib/libutil/ftime.3
@@ -28,14 +28,14 @@
.\" @(#)ftime.3 8.1 (Berkeley) 6/4/93
.\" $FreeBSD$
.\"
-.Dd August 4, 2018
+.Dd May 6, 2023
.Dt FTIME 3
.Os
.Sh NAME
.Nm ftime
.Nd get date and time
.Sh LIBRARY
-.Lb libcompat
+.Lb libuitl
.Sh SYNOPSIS
.In sys/types.h
.In sys/timeb.h
diff --git a/lib/libcompat/4.1/ftime.c b/lib/libutil/ftime.c
rename from lib/libcompat/4.1/ftime.c
rename to lib/libutil/ftime.c
--- a/lib/libcompat/4.1/ftime.c
+++ b/lib/libutil/ftime.c
@@ -35,6 +35,8 @@
#include <sys/types.h>
#include <sys/time.h>
+
+#define _IN_LIBUITL
#include <sys/timeb.h>
int
diff --git a/sys/sys/timeb.h b/sys/sys/timeb.h
--- a/sys/sys/timeb.h
+++ b/sys/sys/timeb.h
@@ -40,7 +40,7 @@
#ifndef _SYS_TIMEB_H_
#define _SYS_TIMEB_H_
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(_IN_LIBUITL)
#warning "this file includes <sys/timeb.h> which is deprecated"
#endif

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 23, 6:29 AM (15 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37122370
Default Alt Text
D39994.id121960.diff (2 KB)

Event Timeline