Index: flt_pack.inc
===================================================================
--- flt_pack.inc	(revision 25888)
+++ flt_pack.inc	(working copy)
@@ -17,11 +17,7 @@
 //
 // ---------------------------------------------------------------------
 {$if defined(VALREAL_32) and not defined(VALREAL_PACK)}
-{$if defined(fpc_softfpu_implementation)
-     or ( defined(FPC_SYSTEM_HAS_extractFloat32Frac)
-      and defined(FPC_SYSTEM_HAS_extractFloat32Exp)
-      and defined(FPC_SYSTEM_HAS_extractFloat32Sign)
-        )}
+{$ifdef fpc_softfpu_implementation}
 
 function unpack_float( const f: ValReal; out minus: boolean ): TDIY_FP; {$ifdef grisu1_inline}inline;{$endif}
 begin
@@ -116,11 +112,7 @@
 
 {$else not cpujvm}
 
-{$if defined(fpc_softfpu_implementation)
-     or ( defined(FPC_SYSTEM_HAS_extractFloat64Frac)
-      and defined(FPC_SYSTEM_HAS_extractFloat64Exp)
-      and defined(FPC_SYSTEM_HAS_extractFloat64Sign)
-        )}
+{$ifdef fpc_softfpu_implementation}
 
 function unpack_float( const f: ValReal; out minus: boolean ): TDIY_FP; {$ifdef grisu1_inline}inline;{$endif}
 begin