Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/lib/libcrypto/rc4/rc4test.c b/src/lib/libcrypto/rc4/rc4test.c
index 633a79e758..4312605ccb 100644
--- a/src/lib/libcrypto/rc4/rc4test.c
+++ b/src/lib/libcrypto/rc4/rc4test.c
@@ -120,6 +120,12 @@ int main(int argc, char *argv[])
         RC4_KEY key;
         unsigned char obuf[512];
 
+#if !defined(OPENSSL_PIC)
+        void OPENSSL_cpuid_setup(void);
+
+        OPENSSL_cpuid_setup();
+#endif
+
         for (i=0; i<6; i++)
                 {
                 RC4_set_key(&key,keys[i][0],&(keys[i][1]));