Date: Mon, 4 May 2015 12:42:53 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282415 - head/usr.sbin/ntp Message-ID: <201505041242.t44CgrTd090709@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Mon May 4 12:42:52 2015 New Revision: 282415 URL: https://svnweb.freebsd.org/changeset/base/282415 Log: Restore CPU dependent compile time conditionals. MFC after: 1 month (with r281143 and r282408) Modified: head/usr.sbin/ntp/config.h Modified: head/usr.sbin/ntp/config.h ============================================================================== --- head/usr.sbin/ntp/config.h Mon May 4 09:33:57 2015 (r282414) +++ head/usr.sbin/ntp/config.h Mon May 4 12:42:52 2015 (r282415) @@ -1469,13 +1469,21 @@ /* #undef SCO5_CLOCK */ /* The size of `char*', as computed by sizeof. */ +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_CHARP 8 +#else +#define SIZEOF_CHARP 4 +#endif /* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 /* The size of `long', as computed by sizeof. */ +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_LONG 8 +#else +#define SIZEOF_LONG 4 +#endif /* The size of `long long', as computed by sizeof. */ #define SIZEOF_LONG_LONG 8 @@ -1490,7 +1498,11 @@ #define SIZEOF_SIGNED_CHAR 1 /* The size of `time_t', as computed by sizeof. */ +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_TIME_T 8 +#else +#define SIZEOF_TIME_T 4 +#endif /* Does SIOCGIFCONF return size in the buffer? */ /* #undef SIZE_RETURNED_IN_BUFFER */ @@ -1516,7 +1528,15 @@ /* #undef STRERROR_R_CHAR_P */ /* canonical system (cpu-vendor-os) of where we should run */ -#define STR_SYSTEM "amd64-portbld-freebsd10.1" +#if defined(__alpha__) +#define STR_SYSTEM "alpha-undermydesk-freebsd" +#elif defined(__sparc64__) +#define STR_SYSTEM "sparc64-undermydesk-freebsd" +#elif defined(__amd64__) +#define STR_SYSTEM "amd64-undermydesk-freebsd" +#else +#define STR_SYSTEM "i386-undermydesk-freebsd" +#endif /* Does Xettimeofday take 1 arg? */ /* #undef SYSV_TIMEOFDAY */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505041242.t44CgrTd090709>