aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/et/ChangeLog5
-rw-r--r--src/util/et/com_err.c4
-rw-r--r--src/util/et/com_err.h16
-rw-r--r--src/util/et/error_message.c6
-rw-r--r--src/util/et/init_et.c6
-rw-r--r--src/util/profile/ChangeLog5
-rw-r--r--src/util/profile/prof_get.c22
-rw-r--r--src/util/profile/prof_init.c12
-rw-r--r--src/util/profile/prof_set.c8
-rw-r--r--src/util/profile/profile.hin42
10 files changed, 66 insertions, 60 deletions
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 440b6c6..687a14e 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03 Ken Raeburn <raeburn@mit.edu>
+
+ * com_err.c, com_err.h, error_message.c, init_et.c: Don't use
+ KRB5_DLLIMP.
+
2001-06-20 Ezra Peisach <epeisach@mit.edu>
* error_message.c (error_message): Conditional label on _sgi so
diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c
index 47f0204..39dc672 100644
--- a/src/util/et/com_err.c
+++ b/src/util/et/com_err.c
@@ -98,7 +98,7 @@ static void default_com_err_proc(whoami, code, fmt, ap)
#endif
}
-KRB5_DLLIMP void KRB5_CALLCONV com_err_va(whoami, code, fmt, ap)
+void KRB5_CALLCONV com_err_va(whoami, code, fmt, ap)
const char FAR *whoami;
errcode_t code;
const char FAR *fmt;
@@ -111,7 +111,7 @@ KRB5_DLLIMP void KRB5_CALLCONV com_err_va(whoami, code, fmt, ap)
}
-KRB5_DLLIMP void KRB5_CALLCONV_C com_err(const char FAR *whoami,
+void KRB5_CALLCONV_C com_err(const char FAR *whoami,
errcode_t code,
const char FAR *fmt, ...)
{
diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 0ac8b28..9af011c 100644
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -19,12 +19,10 @@
#ifndef KRB5_CALLCONV
#define KRB5_CALLCONV
#define KRB5_CALLCONV_C
-#define KRB5_DLLIMP
-/* We don't use these, but since we're using the Kerberos ones, we
- need to either provide all the ones the Kerberos and GSSAPI headers
+/* We don't use this, but since we're using the Kerberos ones, we
+ need to either provide all the ones the Kerberos headers
will use, or not define KRB5_CALLCONV, since that's the only one
they test. */
-#define GSS_DLLIMP
#define KRB5_EXPORTVAR
#endif
@@ -50,18 +48,18 @@ extern "C" {
#endif
/* Public interfaces */
-KRB5_DLLIMP extern void KRB5_CALLCONV_C com_err
+extern void KRB5_CALLCONV_C com_err
(const char FAR *, errcode_t, const char FAR *, ...);
-KRB5_DLLIMP extern void KRB5_CALLCONV com_err_va
+extern void KRB5_CALLCONV com_err_va
(const char FAR *whoami, errcode_t code, const char FAR *fmt,
va_list ap);
-KRB5_DLLIMP extern /*@observer@*//*@dependent@*/ const char FAR * KRB5_CALLCONV error_message
+extern /*@observer@*//*@dependent@*/ const char FAR * KRB5_CALLCONV error_message
(errcode_t)
/*@modifies internalState@*/;
-KRB5_DLLIMP extern errcode_t KRB5_CALLCONV add_error_table
+extern errcode_t KRB5_CALLCONV add_error_table
(/*@dependent@*/ const struct error_table FAR *)
/*@modifies internalState@*/;
-KRB5_DLLIMP extern errcode_t KRB5_CALLCONV remove_error_table
+extern errcode_t KRB5_CALLCONV remove_error_table
(const struct error_table FAR *)
/*@modifies internalState@*/;
diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
index 0d74d30..48c9b1f 100644
--- a/src/util/et/error_message.c
+++ b/src/util/et/error_message.c
@@ -74,7 +74,7 @@ static int etl_used = 0;
#define dprintf(X) printf X
#endif
-KRB5_DLLIMP const char FAR * KRB5_CALLCONV
+const char FAR * KRB5_CALLCONV
error_message(long code)
/*@modifies internalState@*/
{
@@ -242,7 +242,7 @@ oops:
}
/*@-incondefs@*/ /* _et_list is global on unix but not in header annotations */
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
add_error_table(/*@dependent@*/ const struct error_table FAR * et)
#ifndef _MSDOS
/*@modifies _et_list,et_list_dynamic@*/
@@ -274,7 +274,7 @@ add_error_table(/*@dependent@*/ const struct error_table FAR * et)
}
/*@-incondefs@*/ /* _et_list is global on unix but not in header annotations */
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
remove_error_table(const struct error_table FAR * et)
#ifdef _MSDOS
/*@modifies _et_list,et_list_dynamic,etl_used,etl@*/
diff --git a/src/util/et/init_et.c b/src/util/et/init_et.c
index a1ea1dd..c47acb7 100644
--- a/src/util/et/init_et.c
+++ b/src/util/et/init_et.c
@@ -58,7 +58,7 @@ int init_error_table(msgs, base, count)
return 0;
}
-KRB5_DLLIMP extern errcode_t KRB5_CALLCONV et_init(ectx)
+extern errcode_t KRB5_CALLCONV et_init(ectx)
et_ctx FAR *ectx;
{
struct et_context FAR *ctx;
@@ -74,7 +74,7 @@ KRB5_DLLIMP extern errcode_t KRB5_CALLCONV et_init(ectx)
return 0;
}
-KRB5_DLLIMP extern void KRB5_CALLCONV et_shutdown(ectx)
+extern void KRB5_CALLCONV et_shutdown(ectx)
et_ctx ectx;
{
struct et_list FAR *p, FAR *n;
@@ -88,7 +88,7 @@ KRB5_DLLIMP extern void KRB5_CALLCONV et_shutdown(ectx)
free(ectx);
}
-KRB5_DLLIMP extern errcode_t KRB5_CALLCONV et_add_error_table(ectx, tbl)
+extern errcode_t KRB5_CALLCONV et_add_error_table(ectx, tbl)
et_ctx ectx;
struct error_table FAR *tbl;
{
diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index 3859a78..a9d6f8a 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-03 Ken Raeburn <raeburn@mit.edu>
+
+ * prof_get.c, prof_init.c, prof_set.c, profile.hin: Don't use
+ KRB5_DLLIMP.
+
2001-07-19 Ken Raeburn <raeburn@mit.edu>
* prof_tree.c (struct profile_iterator): Member "names" now points
diff --git a/src/util/profile/prof_get.c b/src/util/profile/prof_get.c
index 042eac6..e12010c 100644
--- a/src/util/profile/prof_get.c
+++ b/src/util/profile/prof_get.c
@@ -123,7 +123,7 @@ static int is_list_member(list, str)
* This function frees a null-terminated list as returned by
* profile_get_values.
*/
-KRB5_DLLIMP void KRB5_CALLCONV profile_free_list(list)
+void KRB5_CALLCONV profile_free_list(list)
char **list;
{
char **cp;
@@ -136,7 +136,7 @@ KRB5_DLLIMP void KRB5_CALLCONV profile_free_list(list)
free(list);
}
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_get_values(profile, names, ret_values)
profile_t profile;
const char *const *names;
@@ -206,7 +206,7 @@ cleanup:
return retval;
}
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_get_string(profile, name, subname, subsubname,
def_val, ret_string)
profile_t profile;
@@ -241,7 +241,7 @@ profile_get_string(profile, name, subname, subsubname,
return 0;
}
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_get_integer(profile, name, subname, subsubname,
def_val, ret_int)
profile_t profile;
@@ -320,7 +320,7 @@ profile_parse_boolean(s, ret_boolean)
return PROF_BAD_BOOLEAN;
}
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_get_boolean(profile, name, subname, subsubname,
def_val, ret_boolean)
profile_t profile;
@@ -355,7 +355,7 @@ profile_get_boolean(profile, name, subname, subsubname,
* This function will return the list of the names of subections in the
* under the specified section name.
*/
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_get_subsection_names(profile, names, ret_names)
profile_t profile;
const char **names;
@@ -393,7 +393,7 @@ cleanup:
* This function will return the list of the names of relations in the
* under the specified section name.
*/
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_get_relation_names(profile, names, ret_names)
profile_t profile;
const char **names;
@@ -427,7 +427,7 @@ cleanup:
return retval;
}
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_iterator_create(profile, names, flags, ret_iter)
profile_t profile;
const char **names;
@@ -437,14 +437,14 @@ profile_iterator_create(profile, names, flags, ret_iter)
return profile_node_iterator_create(profile, names, flags, ret_iter);
}
-KRB5_DLLIMP void KRB5_CALLCONV
+void KRB5_CALLCONV
profile_iterator_free(iter_p)
void **iter_p;
{
profile_node_iterator_free(iter_p);
}
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_iterator(iter_p, ret_name, ret_value)
void **iter_p;
char **ret_name, **ret_value;
@@ -482,7 +482,7 @@ profile_iterator(iter_p, ret_name, ret_value)
return 0;
}
-KRB5_DLLIMP void KRB5_CALLCONV
+void KRB5_CALLCONV
profile_release_string(str)
char *str;
{
diff --git a/src/util/profile/prof_init.c b/src/util/profile/prof_init.c
index b3b275a..d939d26 100644
--- a/src/util/profile/prof_init.c
+++ b/src/util/profile/prof_init.c
@@ -23,7 +23,7 @@ typedef int prof_int32;
error(do not have a 4-byte integer type)
#endif /* SIZEOF_LONG == 4 */
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_init(files, ret_profile)
const_profile_filespec_t *files;
profile_t *ret_profile;
@@ -77,7 +77,7 @@ profile_init(files, ret_profile)
/*
* On MacOS, profile_init_path is the same as profile_init
*/
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_init_path(filepath, ret_profile)
const_profile_filespec_list_t filepath;
profile_t *ret_profile;
@@ -129,7 +129,7 @@ profile_init_path(filepath, ret_profile)
return retval;
}
#else
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_init_path(filelist, ret_profile)
profile_filespec_list_t filelist;
profile_t *ret_profile;
@@ -138,7 +138,7 @@ profile_init_path(filelist, ret_profile)
}
#endif
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_flush(profile)
profile_t profile;
{
@@ -151,7 +151,7 @@ profile_flush(profile)
return 0;
}
-KRB5_DLLIMP void KRB5_CALLCONV
+void KRB5_CALLCONV
profile_abandon(profile)
profile_t profile;
{
@@ -168,7 +168,7 @@ profile_abandon(profile)
free(profile);
}
-KRB5_DLLIMP void KRB5_CALLCONV
+void KRB5_CALLCONV
profile_release(profile)
profile_t profile;
{
diff --git a/src/util/profile/prof_set.c b/src/util/profile/prof_set.c
index 0c9bf89..1f2b16d 100644
--- a/src/util/profile/prof_set.c
+++ b/src/util/profile/prof_set.c
@@ -51,7 +51,7 @@ static errcode_t rw_setup(profile)
*
* ADL - 2/23/99, rewritten TYT 2/25/99
*/
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_update_relation(profile, names, old_value, new_value)
profile_t profile;
const char **names;
@@ -104,7 +104,7 @@ profile_update_relation(profile, names, old_value, new_value)
*
* TYT - 2/25/99
*/
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_clear_relation(profile, names)
profile_t profile;
const char **names;
@@ -151,7 +151,7 @@ profile_clear_relation(profile, names)
*
* ADL - 2/23/99, rewritten TYT 2/25/99
*/
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_rename_section(profile, names, new_name)
profile_t profile;
const char **names;
@@ -204,7 +204,7 @@ profile_rename_section(profile, names, new_name)
*
* ADL - 2/23/99, rewritten TYT 2/25/99
*/
-KRB5_DLLIMP errcode_t KRB5_CALLCONV
+errcode_t KRB5_CALLCONV
profile_add_relation(profile, names, new_value)
profile_t profile;
const char **names;
diff --git a/src/util/profile/profile.hin b/src/util/profile/profile.hin
index ca6315c..fc368b1 100644
--- a/src/util/profile/profile.hin
+++ b/src/util/profile/profile.hin
@@ -12,8 +12,6 @@
#ifndef KRB5_CALLCONV
#define KRB5_CALLCONV
#define KRB5_CALLCONV_C
-#define KRB5_DLLIMP
-#define GSS_DLLIMP
#define KRB5_EXPORTVAR
#define FAR
#define NEAR
@@ -65,71 +63,71 @@ typedef FSSpec const_profile_filespec_t;
typedef FSSpec* const_profile_filespec_list_t;
#endif
-KRB5_DLLIMP long KRB5_CALLCONV profile_init
+long KRB5_CALLCONV profile_init
PROTOTYPE ((const_profile_filespec_t *files, profile_t *ret_profile));
-KRB5_DLLIMP long KRB5_CALLCONV profile_init_path
+long KRB5_CALLCONV profile_init_path
PROTOTYPE ((const_profile_filespec_list_t filelist, profile_t *ret_profile));
-KRB5_DLLIMP long KRB5_CALLCONV profile_flush
+long KRB5_CALLCONV profile_flush
PROTOTYPE ((profile_t profile));
-KRB5_DLLIMP void KRB5_CALLCONV profile_abandon
+void KRB5_CALLCONV profile_abandon
PROTOTYPE ((profile_t profile));
-KRB5_DLLIMP void KRB5_CALLCONV profile_release
+void KRB5_CALLCONV profile_release
PROTOTYPE ((profile_t profile));
-KRB5_DLLIMP long KRB5_CALLCONV profile_get_values
+long KRB5_CALLCONV profile_get_values
PROTOTYPE ((profile_t profile, const char *const *names, char ***ret_values));
-KRB5_DLLIMP void KRB5_CALLCONV profile_free_list
+void KRB5_CALLCONV profile_free_list
PROTOTYPE ((char **list));
-KRB5_DLLIMP long KRB5_CALLCONV profile_get_string
+long KRB5_CALLCONV profile_get_string
PROTOTYPE((profile_t profile, const char *name, const char *subname,
const char *subsubname, const char *def_val,
char **ret_string));
-KRB5_DLLIMP long KRB5_CALLCONV profile_get_integer
+long KRB5_CALLCONV profile_get_integer
PROTOTYPE((profile_t profile, const char *name, const char *subname,
const char *subsubname, int def_val,
int *ret_default));
-KRB5_DLLIMP long KRB5_CALLCONV profile_get_boolean
+long KRB5_CALLCONV profile_get_boolean
PROTOTYPE((profile_t profile, const char *name, const char *subname,
const char *subsubname, int def_val,
int *ret_default));
-KRB5_DLLIMP long KRB5_CALLCONV profile_get_relation_names
+long KRB5_CALLCONV profile_get_relation_names
PROTOTYPE((profile_t profile, const char **names, char ***ret_names));
-KRB5_DLLIMP long KRB5_CALLCONV profile_get_subsection_names
+long KRB5_CALLCONV profile_get_subsection_names
PROTOTYPE((profile_t profile, const char **names, char ***ret_names));
-KRB5_DLLIMP long KRB5_CALLCONV profile_iterator_create
+long KRB5_CALLCONV profile_iterator_create
PROTOTYPE((profile_t profile, const char **names,
int flags, void **ret_iter));
-KRB5_DLLIMP void KRB5_CALLCONV profile_iterator_free
+void KRB5_CALLCONV profile_iterator_free
PROTOTYPE((void **iter_p));
-KRB5_DLLIMP long KRB5_CALLCONV profile_iterator
+long KRB5_CALLCONV profile_iterator
PROTOTYPE((void **iter_p, char **ret_name, char **ret_value));
-KRB5_DLLIMP void KRB5_CALLCONV profile_release_string PROTOTYPE((char *str));
+void KRB5_CALLCONV profile_release_string PROTOTYPE((char *str));
-KRB5_DLLIMP long KRB5_CALLCONV profile_update_relation
+long KRB5_CALLCONV profile_update_relation
PROTOTYPE((profile_t profile, const char **names,
const char *old_value, const char *new_value));
-KRB5_DLLIMP long KRB5_CALLCONV profile_clear_relation
+long KRB5_CALLCONV profile_clear_relation
PROTOTYPE((profile_t profile, const char **names));
-KRB5_DLLIMP long KRB5_CALLCONV profile_rename_section
+long KRB5_CALLCONV profile_rename_section
PROTOTYPE((profile_t profile, const char **names,
const char *new_name));
-KRB5_DLLIMP long KRB5_CALLCONV profile_add_relation
+long KRB5_CALLCONV profile_add_relation
PROTOTYPE((profile_t profile, const char **names,
const char *new_value));