From e2e08139bd9a3ee958c15d117417ae15b1bf6970 Mon Sep 17 00:00:00 2001 From: didg Date: Sun, 8 Nov 2009 22:12:40 +0000 Subject: [PATCH] OOPS, undo some commits in 'better layout for struct vol' only keep volume.h --- include/atalk/logger.h | 2 +- include/atalk/uam.h | 15 +++++++-------- include/atalk/util.h | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/include/atalk/logger.h b/include/atalk/logger.h index e2cbbbca..0ad267bc 100644 --- a/include/atalk/logger.h +++ b/include/atalk/logger.h @@ -159,7 +159,7 @@ void set_processname(const char *processname); */ /* LOG macro func no.1: log the message to file */ -__attribute__ ((visibility("default"))) void make_log_entry(enum loglevels loglevel, enum logtypes logtype, const char *file, int line, char *message, ...); +void make_log_entry(enum loglevels loglevel, enum logtypes logtype, const char *file, int line, char *message, ...); /* Note: diff --git a/include/atalk/uam.h b/include/atalk/uam.h index f32eb7f2..f54a5d31 100644 --- a/include/atalk/uam.h +++ b/include/atalk/uam.h @@ -15,7 +15,7 @@ #endif /* TRU64 */ /* just a label for exported bits */ -#define UAM_MODULE_EXPORT __attribute__ ((visibility("default"))) +#define UAM_MODULE_EXPORT /* type of uam */ #define UAM_MODULE_SERVER 1 @@ -78,18 +78,17 @@ struct session_info { }; /* register and unregister uams with these functions */ -extern UAM_MODULE_EXPORT int uam_register (const int, const char *, const char *, ...); -extern UAM_MODULE_EXPORT void uam_unregister (const int, const char *); +extern int uam_register (const int, const char *, const char *, ...); +extern void uam_unregister (const int, const char *); /* helper functions */ -extern UAM_MODULE_EXPORT struct passwd *uam_getname (void*, char *, const int); -extern UAM_MODULE_EXPORT int uam_checkuser (const struct passwd *); +extern struct passwd *uam_getname (void*, char *, const int); +extern int uam_checkuser (const struct passwd *); /* afp helper functions */ -extern UAM_MODULE_EXPORT int uam_afp_read (void *, char *, size_t *, +extern int uam_afp_read (void *, char *, size_t *, int (*)(void *, void *, const int)); -extern UAM_MODULE_EXPORT int uam_afpserver_option (void *, const int, void *, size_t *); - +extern int uam_afpserver_option (void *, const int, void *, size_t *); #ifdef TRU64 extern void uam_afp_getcmdline (int *, char ***); extern int uam_sia_validate_user (sia_collect_func_t *, int, char **, diff --git a/include/atalk/util.h b/include/atalk/util.h index 69a87556..21bb3d7c 100644 --- a/include/atalk/util.h +++ b/include/atalk/util.h @@ -1,5 +1,5 @@ /* - * $Id: util.h,v 1.14 2009-11-08 22:08:04 didg Exp $ + * $Id: util.h,v 1.15 2009-11-08 22:12:40 didg Exp $ */ #ifndef _ATALK_UTIL_H @@ -42,7 +42,7 @@ extern void fault_setup (void (*fn)(void *)); #define server_unlock(x) (unlink(x)) #ifndef HAVE_STRLCPY -__attribute__ ((visibility("default"))) size_t strlcpy (char *, const char *, size_t); +size_t strlcpy (char *, const char *, size_t); #endif #ifndef HAVE_STRLCAT -- 2.39.2