From d44c3377dbbaad35ee9734edd004755ae0937ea1 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Wed, 3 Apr 2013 08:45:55 +0000 Subject: [PATCH] Bumping version to 3.3.0 Change-Id: I4c88bdd449daf6ad3fe4e93ee8fc35d4f38becc4 --- include/minix/config.h | 5 +---- servers/vfs/link.c | 10 ---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/include/minix/config.h b/include/minix/config.h index 216c3fc9f..2ccdec4a0 100644 --- a/include/minix/config.h +++ b/include/minix/config.h @@ -3,11 +3,8 @@ /* Minix release and version numbers. */ #define OS_RELEASE "3" -#define OS_VERSION "2.1" +#define OS_VERSION "3.0" -/* Keep these in sync with os_version above for temp version check in VFS */ -#define OS_VMAJOR 2 -#define OS_VMINOR 1 /* This file sets configuration parameters for the MINIX kernel, FS, and PM. * It is divided up into two main sections. The first section contains * user-settable parameters. In the second section, various internal system diff --git a/servers/vfs/link.c b/servers/vfs/link.c index dafeb3424..c29c2119f 100644 --- a/servers/vfs/link.c +++ b/servers/vfs/link.c @@ -311,12 +311,7 @@ int do_truncate(message *UNUSED(m_out)) length = (off_t) job_m_in.m2_l1; if ((int) job_m_in.flength < 0) return(EINVAL); } else { -#if OS_VMAJOR == 2 && OS_VMINOR == 1 - length = (off_t) make64(job_m_in.m2_l1, 0); /* Ignore higher bits */ -#else -#error "Please remove this version check. Recompile dynamic packages first." length = (off_t) make64(job_m_in.m2_l1, job_m_in.m2_l2); -#endif if (length < 0) return(EINVAL); } @@ -359,12 +354,7 @@ int do_ftruncate(message *UNUSED(m_out)) length = (off_t) job_m_in.m2_l1; if ((int) job_m_in.flength < 0) return(EINVAL); } else { -#if OS_VMAJOR == 2 && OS_VMINOR == 1 - length = (off_t) make64(job_m_in.m2_l1, 0); /* Ignore higher bits */ -#else -#error "Please remove this version check. Recompile dynamic packages first." length = (off_t) make64(job_m_in.m2_l1, job_m_in.m2_l2); -#endif if (length < 0) return(EINVAL); }