Various Win32 fixes. Win95 doesn't support MoveFileEx() (which was used for a

[openssl.git] / crypto / x509 / x509_obj.c

diff --git a/crypto/x509/x509_obj.c b/crypto/x509/x509_obj.c
index 5a16fd500a0798d0f20a559f55d51df3ce56c508..b283a62f5d282e343dd5ce2ffa2983205322f348 100644 (file)
--- a/crypto/x509/x509_obj.c
+++ b/crypto/x509/x509_obj.c
@@ -58,18 +58,15 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "lhash.h"
-#include "objects.h"
-#include "x509.h"
-#include "buffer.h"
+#include <openssl/lhash.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/buffer.h>
 
-char *X509_NAME_oneline(a,buf,len)
-X509_NAME *a;
-char *buf;
-int len;
+char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
        {
        X509_NAME_ENTRY *ne;
-       unsigned int i;
+int i;
        int n,lold,l,l1,l2,num,j,type;
        const char *s;
        char *p;
@@ -99,9 +96,9 @@ int len;
 
        len--; /* space for '\0' */
        l=0;
-       for (i=0; (int)i<sk_num(a->entries); i++)
+       for (i=0; i<sk_X509_NAME_ENTRY_num(a->entries); i++)
                {
-               ne=(X509_NAME_ENTRY *)sk_value(a->entries,i);
+               ne=sk_X509_NAME_ENTRY_value(a->entries,i);
                n=OBJ_obj2nid(ne->object);
                if ((n == NID_undef) || ((s=OBJ_nid2sn(n)) == NULL))
                        {