Page MenuHomeFreeBSD
Files F150486068

D43254.id132026.diff
No OneTemporary
Actions

D43254.id132026.diff
View Options

diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
--- a/lib/libc/stdlib/div.c
+++ b/lib/libc/stdlib/div.c
@@ -41,7 +41,7 @@
r.quot = num / denom;
r.rem = num % denom;
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
+
/*
* The ANSI standard says that |r.quot| <= |n/d|, where
* n/d is to be computed in infinite precision. In other
@@ -69,6 +69,6 @@
r.quot++;
r.rem -= denom;
}
-#endif
+
return (r);
}
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
--- a/lib/libc/stdlib/imaxdiv.c
+++ b/lib/libc/stdlib/imaxdiv.c
@@ -36,11 +36,11 @@
retval.quot = numer / denom;
retval.rem = numer % denom;
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
+
if (numer >= 0 && retval.rem < 0) {
retval.quot++;
retval.rem -= denom;
}
-#endif
+
return (retval);
}
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
--- a/lib/libc/stdlib/ldiv.c
+++ b/lib/libc/stdlib/ldiv.c
@@ -43,11 +43,11 @@
r.quot = num / denom;
r.rem = num % denom;
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
+
if (num >= 0 && r.rem < 0) {
r.quot++;
r.rem -= denom;
}
-#endif
+
return (r);
}
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
--- a/lib/libc/stdlib/lldiv.c
+++ b/lib/libc/stdlib/lldiv.c
@@ -36,11 +36,11 @@
retval.quot = numer / denom;
retval.rem = numer % denom;
-#if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
+
if (numer >= 0 && retval.rem < 0) {
retval.quot++;
retval.rem -= denom;
}
-#endif
+
return (retval);
}
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -10,19 +10,8 @@
.include <bsd.compiler.mk>
-# the default is gnu99 for now
CSTD?= gnu17
-.if ${CSTD} == "c89" || ${CSTD} == "c90"
-CFLAGS+= -std=iso9899:1990
-.elif ${CSTD} == "c94" || ${CSTD} == "c95"
-CFLAGS+= -std=iso9899:199409
-.elif ${CSTD} == "c99"
-CFLAGS+= -std=iso9899:1999
-.else # CSTD
-CFLAGS+= -std=${CSTD}
-.endif # CSTD
-
.if !empty(CXXSTD)
CXXFLAGS+= -std=${CXXSTD}
.endif
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -276,18 +276,6 @@
CSTD?= gnu17
-.if ${CSTD} == "k&r"
-CFLAGS+= -traditional
-.elif ${CSTD} == "c89" || ${CSTD} == "c90"
-CFLAGS+= -std=iso9899:1990
-.elif ${CSTD} == "c94" || ${CSTD} == "c95"
-CFLAGS+= -std=iso9899:199409
-.elif ${CSTD} == "c99"
-CFLAGS+= -std=iso9899:1999
-.else # CSTD
-CFLAGS+= -std=${CSTD}
-.endif # CSTD
-
# Please keep this if in sync with bsd.sys.mk
.if ${LD} != "ld" && (${CC:[1]:H} != ${LD:[1]:H} || ${LD:[1]:T} != "ld")
# Add -fuse-ld=${LD} if $LD is in a different directory or not called "ld".
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -28,11 +28,6 @@
#ifndef FLEXINT_H
#define FLEXINT_H
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-
-#if defined(__FreeBSD__) || \
- (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
-
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
*/
diff --git a/usr.bin/lex/initskel.c b/usr.bin/lex/initskel.c
--- a/usr.bin/lex/initskel.c
+++ b/usr.bin/lex/initskel.c
@@ -466,11 +466,6 @@
"#ifndef FLEXINT_H",
"#define FLEXINT_H",
"",
- "/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */",
- "",
- "#if defined(__FreeBSD__) || \\",
- " (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)",
- "",
"/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,",
" * if you want the limit (max/min) macros for int types. ",
" */",

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 2, 3:33 PM (7 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30727908
Default Alt Text
D43254.id132026.diff (3 KB)

Event Timeline