From 3b7ff465c17595d5f24256e524de0b87ff99e465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 17 Apr 2008 10:02:03 +0000
Subject: [PATCH] Add declspec for Windows

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@23026 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/acache.c    |  2 +-
 lib/krb5/constants.c |  4 ++--
 lib/krb5/fcache.c    |  2 +-
 lib/krb5/kcm.c       |  2 +-
 lib/krb5/krb5.h      | 41 +++++++++++++++++++++--------------------
 lib/krb5/mcache.c    |  2 +-
 lib/krb5/scache.c    |  2 +-
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/lib/krb5/acache.c b/lib/krb5/acache.c
index 1e886004f..573f02207 100644
--- a/lib/krb5/acache.c
+++ b/lib/krb5/acache.c
@@ -999,7 +999,7 @@ acc_set_default(krb5_context context, krb5_ccache id)
  * @ingroup krb5_ccache
  */
 
-const krb5_cc_ops krb5_acc_ops = {
+KRB5_LIB_VARIABLE const krb5_cc_ops krb5_acc_ops = {
     KRB5_CC_OPS_VERSION,
     "API",
     acc_get_name,
diff --git a/lib/krb5/constants.c b/lib/krb5/constants.c
index 6be160584..dc96bcb63 100644
--- a/lib/krb5/constants.c
+++ b/lib/krb5/constants.c
@@ -35,9 +35,9 @@
 
 RCSID("$Id$");
 
-const char *krb5_config_file = 
+KRB5_LIB_VARIABLE const char *krb5_config_file = 
 #ifdef __APPLE__
 "/Library/Preferences/edu.mit.Kerberos:"
 #endif
 SYSCONFDIR "/krb5.conf:/etc/krb5.conf";
-const char *krb5_defkeyname = KEYTAB_DEFAULT;
+KRB5_LIB_VARIABLE const char *krb5_defkeyname = KEYTAB_DEFAULT;
diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c
index ea2ed3eb0..74b12b21b 100644
--- a/lib/krb5/fcache.c
+++ b/lib/krb5/fcache.c
@@ -909,7 +909,7 @@ fcc_default_name(krb5_context context, char **str)
  * @ingroup krb5_ccache
  */
 
-const krb5_cc_ops krb5_fcc_ops = {
+KRB5_LIB_VARIABLE const krb5_cc_ops krb5_fcc_ops = {
     KRB5_CC_OPS_VERSION,
     "FILE",
     fcc_get_name,
diff --git a/lib/krb5/kcm.c b/lib/krb5/kcm.c
index 1fa8abfbe..f07b4e703 100644
--- a/lib/krb5/kcm.c
+++ b/lib/krb5/kcm.c
@@ -873,7 +873,7 @@ kcm_default_name(krb5_context context, char **str)
  * @ingroup krb5_ccache
  */
 
-const krb5_cc_ops krb5_kcm_ops = {
+KRB5_LIB_VARIABLE const krb5_cc_ops krb5_kcm_ops = {
     KRB5_CC_OPS_VERSION,
     "KCM",
     kcm_get_name,
diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index 2934726d5..220701037 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -594,11 +594,6 @@ typedef EncAPRepPart krb5_ap_rep_enc_part;
 
 #define KRB5_DIGEST_NAME ("digest")
 
-/* variables */
-
-extern const char *krb5_config_file;
-extern const char *krb5_defkeyname;
-
 typedef enum {
     KRB5_PROMPT_TYPE_PASSWORD		= 0x1,
     KRB5_PROMPT_TYPE_NEW_PASSWORD	= 0x2,
@@ -686,21 +681,6 @@ typedef struct krb5_verify_opt {
 #define KRB5_VERIFY_LREALMS		1
 #define KRB5_VERIFY_NO_ADDRESSES	2
 
-extern const krb5_cc_ops krb5_acc_ops;
-extern const krb5_cc_ops krb5_fcc_ops;
-extern const krb5_cc_ops krb5_mcc_ops;
-extern const krb5_cc_ops krb5_kcm_ops;
-extern const krb5_cc_ops krb5_scc_ops;
-
-extern const krb5_kt_ops krb5_fkt_ops;
-extern const krb5_kt_ops krb5_wrfkt_ops;
-extern const krb5_kt_ops krb5_javakt_ops;
-extern const krb5_kt_ops krb5_mkt_ops;
-extern const krb5_kt_ops krb5_akf_ops;
-extern const krb5_kt_ops krb4_fkt_ops;
-extern const krb5_kt_ops krb5_srvtab_fkt_ops;
-extern const krb5_kt_ops krb5_any_ops;
-
 #define KRB5_KPASSWD_VERS_CHANGEPW      1
 #define KRB5_KPASSWD_VERS_SETPW         0xff80
 
@@ -782,5 +762,26 @@ struct sockaddr;
 
 #include <krb5-protos.h>
 
+/* variables */
+
+extern KRB5_LIB_VARIABLE const char *krb5_config_file;
+extern KRB5_LIB_VARIABLE const char *krb5_defkeyname;
+
+
+extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_acc_ops;
+extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_fcc_ops;
+extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_mcc_ops;
+extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_kcm_ops;
+extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_scc_ops;
+
+extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_fkt_ops;
+extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_wrfkt_ops;
+extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_javakt_ops;
+extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_mkt_ops;
+extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_akf_ops;
+extern KRB5_LIB_VARIABLE const krb5_kt_ops krb4_fkt_ops;
+extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_srvtab_fkt_ops;
+extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_any_ops;
+
 #endif /* __KRB5_H__ */
 
diff --git a/lib/krb5/mcache.c b/lib/krb5/mcache.c
index a0f8b8a04..2f15fbb15 100644
--- a/lib/krb5/mcache.c
+++ b/lib/krb5/mcache.c
@@ -452,7 +452,7 @@ mcc_default_name(krb5_context context, char **str)
  * @ingroup krb5_ccache
  */
 
-const krb5_cc_ops krb5_mcc_ops = {
+KRB5_LIB_VARIABLE const krb5_cc_ops krb5_mcc_ops = {
     KRB5_CC_OPS_VERSION,
     "MEMORY",
     mcc_get_name,
diff --git a/lib/krb5/scache.c b/lib/krb5/scache.c
index 0946c0d6c..5f340cb01 100644
--- a/lib/krb5/scache.c
+++ b/lib/krb5/scache.c
@@ -1360,7 +1360,7 @@ scc_set_default(krb5_context context, krb5_ccache id)
  * @ingroup krb5_ccache
  */
 
-const krb5_cc_ops krb5_scc_ops = {
+KRB5_LIB_VARIABLE const krb5_cc_ops krb5_scc_ops = {
     KRB5_CC_OPS_VERSION,
     "SDB",
     scc_get_name,