summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-01-26 13:52:36 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-01-26 13:52:36 +0000
commitca9f55f710febbacc47a35f23d94bf2e0c0736c2 (patch)
tree4021688145b4b28233a70f33e6f7912ba1085230
parent58c0da84dd23b5cad248bdd42d38d20acb6c7966 (diff)
export OPENSSL_isservice and make update
-rw-r--r--crypto/cryptlib.h1
-rw-r--r--crypto/crypto.h3
-rwxr-xr-xutil/libeay.num2
3 files changed, 4 insertions, 2 deletions
diff --git a/crypto/cryptlib.h b/crypto/cryptlib.h
index 4761a894a8..1761f6b668 100644
--- a/crypto/cryptlib.h
+++ b/crypto/cryptlib.h
@@ -103,7 +103,6 @@ extern unsigned int OPENSSL_ia32cap_P[];
void OPENSSL_showfatal(const char *,...);
void *OPENSSL_stderr(void);
extern int OPENSSL_NONPIC_relocated;
-int OPENSSL_isservice(void);
#ifdef __cplusplus
}
diff --git a/crypto/crypto.h b/crypto/crypto.h
index e771206a1b..fd7d3851d1 100644
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -545,6 +545,9 @@ void OpenSSLDie(const char *file,int line,const char *assertion);
unsigned int *OPENSSL_ia32cap_loc(void);
#define OPENSSL_ia32cap ((OPENSSL_ia32cap_loc())[0])
+#ifdef OPENSSL_SYS_WIN32
+int OPENSSL_isservice(void);
+#endif
/* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/util/libeay.num b/util/libeay.num
index fcc0e89624..1f5c1c4bed 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -3658,7 +3658,7 @@ ENGINE_get_ssl_client_cert_function 4045 EXIST:!VMS:FUNCTION:ENGINE
ENGINE_get_ssl_client_cert_fn 4045 EXIST:VMS:FUNCTION:ENGINE
ENGINE_load_ssl_client_cert 4046 EXIST::FUNCTION:ENGINE
ENGINE_load_capi 4047 EXIST::FUNCTION:ENGINE,STATIC_ENGINE
-OPENSSL_isservice 4048 NOEXIST::FUNCTION:
+OPENSSL_isservice 4048 EXIST:WIN32:FUNCTION:
FIPS_dsa_sig_decode 4049 NOEXIST::FUNCTION:
EVP_CIPHER_CTX_clear_flags 4050 NOEXIST::FUNCTION:
FIPS_rand_status 4051 NOEXIST::FUNCTION: