diff --git a/usr.bin/getconf/progenv.gperf b/usr.bin/getconf/progenv.gperf
index 481055393b79..20b8fd89160a 100644
--- a/usr.bin/getconf/progenv.gperf
+++ b/usr.bin/getconf/progenv.gperf
@@ -30,11 +30,11 @@ static const struct map *in_word_set(const char *str);
  * be updated.  (We cheat here and define the supported environments
  * statically.)
  */
-#if defined(__sparc64__) || defined(__amd64__)
+#ifdef	__LP64__
 #define	have_LP64_OFF64		NULL
 #endif
 
-#if defined(__i386__) || defined(__powerpc__)
+#ifdef	__ILP32__
 #define	have_ILP32_OFFBIG	NULL
 #endif