]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Update visibility stuff so we can build libcups.2.dylib without an exports list.
authorMichael R Sweet <michael.r.sweet@gmail.com>
Wed, 10 Oct 2018 05:01:56 +0000 (01:01 -0400)
committerMichael R Sweet <michael.r.sweet@gmail.com>
Wed, 10 Oct 2018 05:01:56 +0000 (01:01 -0400)
19 files changed:
cups/Makefile
cups/array-private.h
cups/cups-private.h
cups/cups.h
cups/debug-private.h
cups/file-private.h
cups/http-private.h
cups/ipp-private.h
cups/ipp.h
cups/language-private.h
cups/language.h
cups/md5-private.h
cups/ppd-private.h
cups/pwg-private.h
cups/raster-private.h
cups/snmp-private.h
cups/string-private.h
cups/thread-private.h
cups/versioning.h

index debe84c79733d841b3a562a5d63c42ed901b774a..94f5e9f10e493cc12c3895a029ac2f576cb83433 100644 (file)
@@ -347,22 +347,16 @@ libcups.so.2:     $(LIBOBJS)
 # libcups.2.dylib
 #
 
-libcups.2.dylib:       $(LIBOBJS) $(LIBCUPSORDER)
-       echo Creating export list for $@...
-       nm -gm $(LIBOBJS) 2>/dev/null | grep "__text" | grep -v weak | \
-               awk '{print $$NF}' | \
-               grep -v -E -e '^(_cupsConnect|_cupsCharset|_cupsEncodingName|_cupsSetDefaults|_cupsSetHTTPError|_cupsUserDefault)$$' | \
-               sort >t.exp
+libcups.2.dylib:       $(LIBOBJS)
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
                -current_version 2.14.0 \
                -compatibility_version 2.0.0 \
-               -exported_symbols_list t.exp \
                $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       $(RM) libcups.dylib t.exp
+       $(RM) libcups.dylib
        $(LN) $@ libcups.dylib
 
 
index d2941a3e32de47014e787ac32f76277c94d22899..e4d7b8ac041cf93cd693cb8047bab92879bffc57 100644 (file)
@@ -30,9 +30,9 @@ extern "C" {
  */
 
 extern int             _cupsArrayAddStrings(cups_array_t *a, const char *s,
-                                            char delim) _CUPS_API_1_5;
+                                            char delim) _CUPS_PRIVATE;
 extern cups_array_t    *_cupsArrayNewStrings(const char *s, char delim)
-                                             _CUPS_API_1_5;
+                                             _CUPS_PRIVATE;
 
 #  ifdef __cplusplus
 }
index 27246dc9033a856ab3c21513fbc952437f4dc049..664f9825e91c4ecc3b47f927917dc4d1bf6c5a8a 100644 (file)
@@ -219,38 +219,38 @@ struct _cups_dinfo_s                      /* Destination capability and status
  */
 
 #  ifdef __APPLE__
-extern CFStringRef     _cupsAppleCopyDefaultPaperID(void);
-extern CFStringRef     _cupsAppleCopyDefaultPrinter(void);
-extern int             _cupsAppleGetUseLastPrinter(void);
-extern void            _cupsAppleSetDefaultPaperID(CFStringRef name);
-extern void            _cupsAppleSetDefaultPrinter(CFStringRef name);
-extern void            _cupsAppleSetUseLastPrinter(int uselast);
+extern CFStringRef     _cupsAppleCopyDefaultPaperID(void) _CUPS_PRIVATE;
+extern CFStringRef     _cupsAppleCopyDefaultPrinter(void) _CUPS_PRIVATE;
+extern int             _cupsAppleGetUseLastPrinter(void) _CUPS_PRIVATE;
+extern void            _cupsAppleSetDefaultPaperID(CFStringRef name) _CUPS_PRIVATE;
+extern void            _cupsAppleSetDefaultPrinter(CFStringRef name) _CUPS_PRIVATE;
+extern void            _cupsAppleSetUseLastPrinter(int uselast) _CUPS_PRIVATE;
 #  endif /* __APPLE__ */
 
-extern char            *_cupsBufferGet(size_t size);
-extern void            _cupsBufferRelease(char *b);
-
-extern http_t          *_cupsConnect(void);
-extern char            *_cupsCreateDest(const char *name, const char *info, const char *device_id, const char *device_uri, char *uri, size_t urisize);
-extern ipp_attribute_t *_cupsEncodeOption(ipp_t *ipp, ipp_tag_t group_tag, _ipp_option_t *map, const char *name, const char *value);
-extern int             _cupsGet1284Values(const char *device_id, cups_option_t **values);
-extern const char      *_cupsGetDestResource(cups_dest_t *dest, unsigned flags, char *resource, size_t resourcesize);
-extern int             _cupsGetDests(http_t *http, ipp_op_t op, const char *name, cups_dest_t **dests, cups_ptype_t type, cups_ptype_t mask);
-extern const char      *_cupsGetPassword(const char *prompt);
-extern void            _cupsGlobalLock(void);
-extern _cups_globals_t *_cupsGlobals(void);
-extern void            _cupsGlobalUnlock(void);
+extern char            *_cupsBufferGet(size_t size) _CUPS_PRIVATE;
+extern void            _cupsBufferRelease(char *b) _CUPS_PRIVATE;
+
+extern http_t          *_cupsConnect(void) _CUPS_PRIVATE;
+extern char            *_cupsCreateDest(const char *name, const char *info, const char *device_id, const char *device_uri, char *uri, size_t urisize) _CUPS_PRIVATE;
+extern ipp_attribute_t *_cupsEncodeOption(ipp_t *ipp, ipp_tag_t group_tag, _ipp_option_t *map, const char *name, const char *value) _CUPS_PRIVATE;
+extern int             _cupsGet1284Values(const char *device_id, cups_option_t **values) _CUPS_PRIVATE;
+extern const char      *_cupsGetDestResource(cups_dest_t *dest, unsigned flags, char *resource, size_t resourcesize) _CUPS_PRIVATE;
+extern int             _cupsGetDests(http_t *http, ipp_op_t op, const char *name, cups_dest_t **dests, cups_ptype_t type, cups_ptype_t mask) _CUPS_PRIVATE;
+extern const char      *_cupsGetPassword(const char *prompt) _CUPS_PRIVATE;
+extern void            _cupsGlobalLock(void) _CUPS_PRIVATE;
+extern _cups_globals_t *_cupsGlobals(void) _CUPS_PRIVATE;
+extern void            _cupsGlobalUnlock(void) _CUPS_PRIVATE;
 #  ifdef HAVE_GSSAPI
-extern const char      *_cupsGSSServiceName(void);
+extern const char      *_cupsGSSServiceName(void) _CUPS_PRIVATE;
 #  endif /* HAVE_GSSAPI */
-extern int             _cupsNextDelay(int current, int *previous);
-extern void            _cupsSetDefaults(void);
-extern void            _cupsSetError(ipp_status_t status, const char *message, int localize);
-extern void            _cupsSetHTTPError(http_status_t status);
+extern int             _cupsNextDelay(int current, int *previous) _CUPS_PRIVATE;
+extern void            _cupsSetDefaults(void) _CUPS_PRIVATE;
+extern void            _cupsSetError(ipp_status_t status, const char *message, int localize) _CUPS_PRIVATE;
+extern void            _cupsSetHTTPError(http_status_t status) _CUPS_PRIVATE;
 #  ifdef HAVE_GSSAPI
-extern int             _cupsSetNegotiateAuthString(http_t *http, const char *method, const char *resource);
+extern int             _cupsSetNegotiateAuthString(http_t *http, const char *method, const char *resource) _CUPS_PRIVATE;
 #  endif /* HAVE_GSSAPI */
-extern char            *_cupsUserDefault(char *name, size_t namesize);
+extern char            *_cupsUserDefault(char *name, size_t namesize) _CUPS_PRIVATE;
 
 
 /*
index 69a00d14ef0abdb806680aa598edb37d765f2ece..e1d3d6870df1c72355e2fb792e6117b05931d4c0 100644 (file)
@@ -328,55 +328,55 @@ typedef int (*cups_server_cert_cb_t)(http_t *http, void *tls,
  * Functions...
  */
 
-extern int             cupsCancelJob(const char *name, int job_id);
+extern int             cupsCancelJob(const char *name, int job_id) _CUPS_PUBLIC;
 extern ipp_t           *cupsDoFileRequest(http_t *http, ipp_t *request,
                                           const char *resource,
-                                          const char *filename);
+                                          const char *filename) _CUPS_PUBLIC;
 extern ipp_t           *cupsDoRequest(http_t *http, ipp_t *request,
-                                      const char *resource);
+                                      const char *resource) _CUPS_PUBLIC;
 extern http_encryption_t cupsEncryption(void);
-extern void            cupsFreeJobs(int num_jobs, cups_job_t *jobs);
+extern void            cupsFreeJobs(int num_jobs, cups_job_t *jobs) _CUPS_PUBLIC;
 extern int             cupsGetClasses(char ***classes) _CUPS_DEPRECATED_MSG("Use cupsEnumDests instead.");
-extern const char      *cupsGetDefault(void);
+extern const char      *cupsGetDefault(void) _CUPS_PUBLIC;
 extern int             cupsGetJobs(cups_job_t **jobs, const char *name,
-                                   int myjobs, int whichjobs);
+                                   int myjobs, int whichjobs) _CUPS_PUBLIC;
 extern int             cupsGetPrinters(char ***printers) _CUPS_DEPRECATED_MSG("Use cupsEnumDests instead.");
-extern ipp_status_t    cupsLastError(void);
+extern ipp_status_t    cupsLastError(void) _CUPS_PUBLIC;
 extern int             cupsPrintFile(const char *name, const char *filename,
                                      const char *title, int num_options,
-                                     cups_option_t *options);
+                                     cups_option_t *options) _CUPS_PUBLIC;
 extern int             cupsPrintFiles(const char *name, int num_files,
                                       const char **files, const char *title,
-                                      int num_options, cups_option_t *options);
+                                      int num_options, cups_option_t *options) _CUPS_PUBLIC;
 extern char            *cupsTempFile(char *filename, int len) _CUPS_DEPRECATED_MSG("Use cupsTempFd or cupsTempFile2 instead.");
-extern int             cupsTempFd(char *filename, int len);
+extern int             cupsTempFd(char *filename, int len) _CUPS_PUBLIC;
 
 extern int             cupsAddDest(const char *name, const char *instance,
-                                   int num_dests, cups_dest_t **dests);
-extern void            cupsFreeDests(int num_dests, cups_dest_t *dests);
+                                   int num_dests, cups_dest_t **dests) _CUPS_PUBLIC;
+extern void            cupsFreeDests(int num_dests, cups_dest_t *dests) _CUPS_PUBLIC;
 extern cups_dest_t     *cupsGetDest(const char *name, const char *instance,
-                                    int num_dests, cups_dest_t *dests);
-extern int             cupsGetDests(cups_dest_t **dests);
-extern void            cupsSetDests(int num_dests, cups_dest_t *dests);
+                                    int num_dests, cups_dest_t *dests) _CUPS_PUBLIC;
+extern int             cupsGetDests(cups_dest_t **dests) _CUPS_PUBLIC;
+extern void            cupsSetDests(int num_dests, cups_dest_t *dests) _CUPS_PUBLIC;
 
 extern int             cupsAddOption(const char *name, const char *value,
-                                     int num_options, cups_option_t **options);
+                                     int num_options, cups_option_t **options) _CUPS_PUBLIC;
 extern void            cupsEncodeOptions(ipp_t *ipp, int num_options,
-                                         cups_option_t *options);
+                                         cups_option_t *options) _CUPS_PUBLIC;
 extern void            cupsFreeOptions(int num_options,
-                                       cups_option_t *options);
+                                       cups_option_t *options) _CUPS_PUBLIC;
 extern const char      *cupsGetOption(const char *name, int num_options,
-                                      cups_option_t *options);
+                                      cups_option_t *options) _CUPS_PUBLIC;
 extern int             cupsParseOptions(const char *arg, int num_options,
-                                        cups_option_t **options);
+                                        cups_option_t **options) _CUPS_PUBLIC;
 
-extern const char      *cupsGetPassword(const char *prompt);
-extern const char      *cupsServer(void);
-extern void            cupsSetEncryption(http_encryption_t e);
-extern void            cupsSetPasswordCB(cups_password_cb_t cb);
-extern void            cupsSetServer(const char *server);
-extern void            cupsSetUser(const char *user);
-extern const char      *cupsUser(void);
+extern const char      *cupsGetPassword(const char *prompt) _CUPS_PUBLIC;
+extern const char      *cupsServer(void) _CUPS_PUBLIC;
+extern void            cupsSetEncryption(http_encryption_t e) _CUPS_PUBLIC;
+extern void            cupsSetPasswordCB(cups_password_cb_t cb) _CUPS_PUBLIC;
+extern void            cupsSetServer(const char *server) _CUPS_PUBLIC;
+extern void            cupsSetUser(const char *user) _CUPS_PUBLIC;
+extern const char      *cupsUser(void) _CUPS_PUBLIC;
 
 /**** New in CUPS 1.1.20 ****/
 extern int             cupsDoAuthentication(http_t *http, const char *method,
@@ -384,7 +384,7 @@ extern int          cupsDoAuthentication(http_t *http, const char *method,
                                             _CUPS_API_1_1_20;
 extern http_status_t   cupsGetFile(http_t *http, const char *resource,
                                    const char *filename) _CUPS_API_1_1_20;
-extern http_status_t   cupsGetFd(http_t *http, const char *resource, int fd);
+extern http_status_t   cupsGetFd(http_t *http, const char *resource, int fd) _CUPS_API_1_1_20;
 extern http_status_t   cupsPutFile(http_t *http, const char *resource,
                                    const char *filename) _CUPS_API_1_1_20;
 extern http_status_t   cupsPutFd(http_t *http, const char *resource, int fd)
index 0bde41b3b83cb3d047b8bed28eb09cd6612a538d..4cabe0d8c041c31afa83a52a7768a5af3ad0f7a2 100644 (file)
@@ -79,9 +79,9 @@ extern "C" {
 
 extern int     _cups_debug_fd _CUPS_PRIVATE;
 extern int     _cups_debug_level _CUPS_PRIVATE;
-extern void    _cups_debug_printf(const char *format, ...) _CUPS_FORMAT(1,2) _CUPS_PUBLIC;
-extern void    _cups_debug_puts(const char *s) _CUPS_PUBLIC;
-extern void    _cups_debug_set(const char *logfile, const char *level, const char *filter, int force) _CUPS_PUBLIC;
+extern void    _cups_debug_printf(const char *format, ...) _CUPS_FORMAT(1,2) _CUPS_PRIVATE;
+extern void    _cups_debug_puts(const char *s) _CUPS_PRIVATE;
+extern void    _cups_debug_set(const char *logfile, const char *level, const char *filter, int force) _CUPS_PRIVATE;
 #  ifdef _WIN32
 extern int     _cups_gettimeofday(struct timeval *tv, void *tz) _CUPS_PRIVATE;
 #    define gettimeofday(a,b) _cups_gettimeofday(a, b)
index dff3ed99199dc4c7a55b6fcda82e65d7baa2e4d3..afa438bee892a9b237e8c33421a8e9e9d5a7b801 100644 (file)
@@ -115,10 +115,10 @@ extern _cups_fc_result_t  _cupsFileCheck(const char *filename,
                                               _cups_fc_filetype_t filetype,
                                               int dorootchecks,
                                               _cups_fc_func_t cb,
-                                              void *context);
+                                              void *context) _CUPS_PRIVATE;
 extern void                    _cupsFileCheckFilter(void *context,
                                                     _cups_fc_result_t result,
-                                                    const char *message);
+                                                    const char *message) _CUPS_PRIVATE;
 
 #  ifdef __cplusplus
 }
index b228ea72e0986e5be16e5d0076161fd4a2cf4b8e..c868bc89c43e97d246ef616fc633124a108bf95b 100644 (file)
@@ -369,9 +369,9 @@ struct ifaddrs                              /**** Interface Structure ****/
 #      define ifa_dstaddr ifa_ifu.ifu_dstaddr
 #    endif /* !ifa_dstaddr */
 
-extern int     _cups_getifaddrs(struct ifaddrs **addrs);
+extern int     _cups_getifaddrs(struct ifaddrs **addrs) _CUPS_PRIVATE;
 #    define getifaddrs _cups_getifaddrs
-extern void    _cups_freeifaddrs(struct ifaddrs *addrs);
+extern void    _cups_freeifaddrs(struct ifaddrs *addrs) _CUPS_PRIVATE;
 #    define freeifaddrs _cups_freeifaddrs
 #  endif /* !_WIN32 && !HAVE_GETIFADDRS */
 
@@ -380,31 +380,31 @@ extern void       _cups_freeifaddrs(struct ifaddrs *addrs);
  * Prototypes...
  */
 
-extern void            _httpAddrSetPort(http_addr_t *addr, int port);
+extern void            _httpAddrSetPort(http_addr_t *addr, int port) _CUPS_PRIVATE;
 extern http_tls_credentials_t
-                       _httpCreateCredentials(cups_array_t *credentials);
+                       _httpCreateCredentials(cups_array_t *credentials) _CUPS_PRIVATE;
 extern char            *_httpDecodeURI(char *dst, const char *src,
-                                       size_t dstsize);
-extern void            _httpDisconnect(http_t *http);
+                                       size_t dstsize) _CUPS_PRIVATE;
+extern void            _httpDisconnect(http_t *http) _CUPS_PRIVATE;
 extern char            *_httpEncodeURI(char *dst, const char *src,
-                                       size_t dstsize);
-extern void            _httpFreeCredentials(http_tls_credentials_t credentials);
+                                       size_t dstsize) _CUPS_PRIVATE;
+extern void            _httpFreeCredentials(http_tls_credentials_t credentials) _CUPS_PRIVATE;
 extern const char      *_httpResolveURI(const char *uri, char *resolved_uri,
                                         size_t resolved_size, int options,
                                         int (*cb)(void *context),
-                                        void *context);
-extern int             _httpSetDigestAuthString(http_t *http, const char *nonce, const char *method, const char *resource);
-extern const char      *_httpStatus(cups_lang_t *lang, http_status_t status);
-extern void            _httpTLSInitialize(void);
-extern size_t          _httpTLSPending(http_t *http);
-extern int             _httpTLSRead(http_t *http, char *buf, int len);
-extern int             _httpTLSSetCredentials(http_t *http);
-extern void            _httpTLSSetOptions(int options, int min_version, int max_version);
-extern int             _httpTLSStart(http_t *http);
-extern void            _httpTLSStop(http_t *http);
-extern int             _httpTLSWrite(http_t *http, const char *buf, int len);
-extern int             _httpUpdate(http_t *http, http_status_t *status);
-extern int             _httpWait(http_t *http, int msec, int usessl);
+                                        void *context) _CUPS_PRIVATE;
+extern int             _httpSetDigestAuthString(http_t *http, const char *nonce, const char *method, const char *resource) _CUPS_PRIVATE;
+extern const char      *_httpStatus(cups_lang_t *lang, http_status_t status) _CUPS_PRIVATE;
+extern void            _httpTLSInitialize(void) _CUPS_PRIVATE;
+extern size_t          _httpTLSPending(http_t *http) _CUPS_PRIVATE;
+extern int             _httpTLSRead(http_t *http, char *buf, int len) _CUPS_PRIVATE;
+extern int             _httpTLSSetCredentials(http_t *http) _CUPS_PRIVATE;
+extern void            _httpTLSSetOptions(int options, int min_version, int max_version) _CUPS_PRIVATE;
+extern int             _httpTLSStart(http_t *http) _CUPS_PRIVATE;
+extern void            _httpTLSStop(http_t *http) _CUPS_PRIVATE;
+extern int             _httpTLSWrite(http_t *http, const char *buf, int len) _CUPS_PRIVATE;
+extern int             _httpUpdate(http_t *http, http_status_t *status) _CUPS_PRIVATE;
+extern int             _httpWait(http_t *http, int msec, int usessl) _CUPS_PRIVATE;
 
 
 /*
index 280d4962940bef48118f149630405e3a20ec4e0b..fa5e4355030f097e3a4180e75f67b183a36dfe42 100644 (file)
@@ -192,21 +192,21 @@ struct _ipp_file_s                        /**** File Parser */
 
 /* encode.c */
 #ifdef DEBUG
-extern const char      *_ippCheckOptions(void);
+extern const char      *_ippCheckOptions(void) _CUPS_PRIVATE;
 #endif /* DEBUG */
-extern _ipp_option_t   *_ippFindOption(const char *name);
+extern _ipp_option_t   *_ippFindOption(const char *name) _CUPS_PRIVATE;
 
 /* ipp-file.c */
-extern ipp_t           *_ippFileParse(_ipp_vars_t *v, const char *filename, void *user_data);
-extern int             _ippFileReadToken(_ipp_file_t *f, char *token, size_t tokensize);
+extern ipp_t           *_ippFileParse(_ipp_vars_t *v, const char *filename, void *user_data) _CUPS_PRIVATE;
+extern int             _ippFileReadToken(_ipp_file_t *f, char *token, size_t tokensize) _CUPS_PRIVATE;
 
 /* ipp-vars.c */
-extern void            _ippVarsDeinit(_ipp_vars_t *v);
-extern void            _ippVarsExpand(_ipp_vars_t *v, char *dst, const char *src, size_t dstsize) _CUPS_NONNULL(1,2,3);
-extern const char      *_ippVarsGet(_ipp_vars_t *v, const char *name);
-extern void            _ippVarsInit(_ipp_vars_t *v, _ipp_fattr_cb_t attrcb, _ipp_ferror_cb_t errorcb, _ipp_ftoken_cb_t tokencb);
-extern const char      *_ippVarsPasswordCB(const char *prompt, http_t *http, const char *method, const char *resource, void *user_data);
-extern int             _ippVarsSet(_ipp_vars_t *v, const char *name, const char *value);
+extern void            _ippVarsDeinit(_ipp_vars_t *v) _CUPS_PRIVATE;
+extern void            _ippVarsExpand(_ipp_vars_t *v, char *dst, const char *src, size_t dstsize) _CUPS_NONNULL(1,2,3) _CUPS_PRIVATE;
+extern const char      *_ippVarsGet(_ipp_vars_t *v, const char *name) _CUPS_PRIVATE;
+extern void            _ippVarsInit(_ipp_vars_t *v, _ipp_fattr_cb_t attrcb, _ipp_ferror_cb_t errorcb, _ipp_ftoken_cb_t tokencb) _CUPS_PRIVATE;
+extern const char      *_ippVarsPasswordCB(const char *prompt, http_t *http, const char *method, const char *resource, void *user_data) _CUPS_PRIVATE;
+extern int             _ippVarsSet(_ipp_vars_t *v, const char *name, const char *value) _CUPS_PRIVATE;
 
 
 /*
index 80f5528b58d14118c8f7a1595d555c722b92276a..6402855a757dd21c2448ca2dd662ee8b269b1b0a 100644 (file)
@@ -746,52 +746,52 @@ typedef int (*ipp_copycb_t)(void *context, ipp_t *dst, ipp_attribute_t *attr);
  */
 
 extern ipp_attribute_t *ippAddBoolean(ipp_t *ipp, ipp_tag_t group,
-                                      const char *name, char value);
+                                      const char *name, char value) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddBooleans(ipp_t *ipp, ipp_tag_t group,
                                        const char *name, int num_values,
-                                       const char *values);
+                                       const char *values) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddDate(ipp_t *ipp, ipp_tag_t group,
-                                   const char *name, const ipp_uchar_t *value);
+                                   const char *name, const ipp_uchar_t *value) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddInteger(ipp_t *ipp, ipp_tag_t group,
                                       ipp_tag_t value_tag, const char *name,
-                                      int value);
+                                      int value) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddIntegers(ipp_t *ipp, ipp_tag_t group,
                                        ipp_tag_t value_tag, const char *name,
-                                       int num_values, const int *values);
+                                       int num_values, const int *values) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddRange(ipp_t *ipp, ipp_tag_t group,
-                                    const char *name, int lower, int upper);
+                                    const char *name, int lower, int upper) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddRanges(ipp_t *ipp, ipp_tag_t group,
                                      const char *name, int num_values,
-                                     const int *lower, const int *upper);
+                                     const int *lower, const int *upper) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddResolution(ipp_t *ipp, ipp_tag_t group,
                                          const char *name, ipp_res_t units,
-                                         int xres, int yres);
+                                         int xres, int yres) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddResolutions(ipp_t *ipp, ipp_tag_t group,
                                           const char *name, int num_values,
                                           ipp_res_t units, const int *xres,
-                                          const int *yres);
-extern ipp_attribute_t *ippAddSeparator(ipp_t *ipp);
+                                          const int *yres) _CUPS_PUBLIC;
+extern ipp_attribute_t *ippAddSeparator(ipp_t *ipp) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddString(ipp_t *ipp, ipp_tag_t group,
                                      ipp_tag_t value_tag, const char *name,
-                                     const char *language, const char *value);
+                                     const char *language, const char *value) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippAddStrings(ipp_t *ipp, ipp_tag_t group,
                                       ipp_tag_t value_tag, const char *name,
                                       int num_values, const char *language,
-                                      const char * const *values);
-extern time_t          ippDateToTime(const ipp_uchar_t *date);
-extern void            ippDelete(ipp_t *ipp);
-extern const char      *ippErrorString(ipp_status_t error);
+                                      const char * const *values) _CUPS_PUBLIC;
+extern time_t          ippDateToTime(const ipp_uchar_t *date) _CUPS_PUBLIC;
+extern void            ippDelete(ipp_t *ipp) _CUPS_PUBLIC;
+extern const char      *ippErrorString(ipp_status_t error) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippFindAttribute(ipp_t *ipp, const char *name,
-                                         ipp_tag_t value_tag);
+                                         ipp_tag_t value_tag) _CUPS_PUBLIC;
 extern ipp_attribute_t *ippFindNextAttribute(ipp_t *ipp, const char *name,
-                                             ipp_tag_t value_tag);
-extern size_t          ippLength(ipp_t *ipp);
-extern ipp_t           *ippNew(void);
-extern ipp_state_t     ippRead(http_t *http, ipp_t *ipp);
-extern const ipp_uchar_t *ippTimeToDate(time_t t);
-extern ipp_state_t     ippWrite(http_t *http, ipp_t *ipp);
-extern int             ippPort(void);
-extern void            ippSetPort(int p);
+                                             ipp_tag_t value_tag) _CUPS_PUBLIC;
+extern size_t          ippLength(ipp_t *ipp) _CUPS_PUBLIC;
+extern ipp_t           *ippNew(void) _CUPS_PUBLIC;
+extern ipp_state_t     ippRead(http_t *http, ipp_t *ipp) _CUPS_PUBLIC;
+extern const ipp_uchar_t *ippTimeToDate(time_t t) _CUPS_PUBLIC;
+extern ipp_state_t     ippWrite(http_t *http, ipp_t *ipp) _CUPS_PUBLIC;
+extern int             ippPort(void) _CUPS_PUBLIC;
+extern void            ippSetPort(int p) _CUPS_PUBLIC;
 
 /**** New in CUPS 1.1.19 ****/
 extern ipp_attribute_t *ippAddCollection(ipp_t *ipp, ipp_tag_t group,
index 5828ceb2994824845e86f80b4189ac3823a60cd6..8c3e61b235802336e7314b58ee939eec0d9d96af 100644 (file)
@@ -58,22 +58,22 @@ typedef struct _cups_message_s              /**** Message catalog entry ****/
  */
 
 #  ifdef __APPLE__
-extern const char      *_cupsAppleLanguage(const char *locale, char *language, size_t langsize);
-extern const char      *_cupsAppleLocale(CFStringRef languageName, char *locale, size_t localesize);
+extern const char      *_cupsAppleLanguage(const char *locale, char *language, size_t langsize) _CUPS_PRIVATE;
+extern const char      *_cupsAppleLocale(CFStringRef languageName, char *locale, size_t localesize) _CUPS_PRIVATE;
 #  endif /* __APPLE__ */
-extern void            _cupsCharmapFlush(void);
-extern const char      *_cupsEncodingName(cups_encoding_t encoding);
-extern void            _cupsLangPrintError(const char *prefix, const char *message);
-extern int             _cupsLangPrintFilter(FILE *fp, const char *prefix, const char *message, ...) _CUPS_FORMAT(3, 4);
-extern int             _cupsLangPrintf(FILE *fp, const char *message, ...) _CUPS_FORMAT(2, 3);
-extern int             _cupsLangPuts(FILE *fp, const char *message);
-extern const char      *_cupsLangString(cups_lang_t *lang, const char *message);
-extern void            _cupsMessageFree(cups_array_t *a);
-extern cups_array_t    *_cupsMessageLoad(const char *filename, int flags);
-extern const char      *_cupsMessageLookup(cups_array_t *a, const char *m);
-extern cups_array_t    *_cupsMessageNew(void *context);
-extern int             _cupsMessageSave(const char *filename, int flags, cups_array_t *a);
-extern void            _cupsSetLocale(char *argv[]);
+extern void            _cupsCharmapFlush(void) _CUPS_PRIVATE;
+extern const char      *_cupsEncodingName(cups_encoding_t encoding) _CUPS_PRIVATE;
+extern void            _cupsLangPrintError(const char *prefix, const char *message) _CUPS_PRIVATE;
+extern int             _cupsLangPrintFilter(FILE *fp, const char *prefix, const char *message, ...) _CUPS_FORMAT(3, 4) _CUPS_PRIVATE;
+extern int             _cupsLangPrintf(FILE *fp, const char *message, ...) _CUPS_FORMAT(2, 3) _CUPS_PRIVATE;
+extern int             _cupsLangPuts(FILE *fp, const char *message) _CUPS_PRIVATE;
+extern const char      *_cupsLangString(cups_lang_t *lang, const char *message) _CUPS_PRIVATE;
+extern void            _cupsMessageFree(cups_array_t *a) _CUPS_PRIVATE;
+extern cups_array_t    *_cupsMessageLoad(const char *filename, int flags) _CUPS_PRIVATE;
+extern const char      *_cupsMessageLookup(cups_array_t *a, const char *m) _CUPS_PRIVATE;
+extern cups_array_t    *_cupsMessageNew(void *context) _CUPS_PRIVATE;
+extern int             _cupsMessageSave(const char *filename, int flags, cups_array_t *a) _CUPS_PRIVATE;
+extern void            _cupsSetLocale(char *argv[]) _CUPS_PRIVATE;
 
 
 #  ifdef __cplusplus
index cf49ae84faca026cc952a66e08e4d34449de0a79..b5ec7e1803a9270b0610f04b74b7555a4ba7db49 100644 (file)
@@ -90,11 +90,11 @@ typedef struct cups_lang_s          /**** Language Cache Structure ****/
  * Prototypes...
  */
 
-extern cups_lang_t     *cupsLangDefault(void);
-extern const char      *cupsLangEncoding(cups_lang_t *lang);
-extern void            cupsLangFlush(void);
-extern void            cupsLangFree(cups_lang_t *lang);
-extern cups_lang_t     *cupsLangGet(const char *language);
+extern cups_lang_t     *cupsLangDefault(void) _CUPS_PUBLIC;
+extern const char      *cupsLangEncoding(cups_lang_t *lang) _CUPS_PUBLIC;
+extern void            cupsLangFlush(void) _CUPS_PUBLIC;
+extern void            cupsLangFree(cups_lang_t *lang) _CUPS_PUBLIC;
+extern cups_lang_t     *cupsLangGet(const char *language) _CUPS_PUBLIC;
 
 #  ifdef __cplusplus
 }
index 8b9bf125bb89eb8c1817f7cdb005b5b04f8a012b..d98132ff82d02eca2256a72018f21e545657c963 100644 (file)
@@ -47,6 +47,8 @@
 #ifndef _CUPS_MD5_PRIVATE_H_
 #  define _CUPS_MD5_PRIVATE_H_
 
+#  include <cups/versioning.h>
+
 /* Define the state of the MD5 Algorithm. */
 typedef struct _cups_md5_state_s {
     unsigned int count[2];             /* message length in bits, lsw first */
@@ -59,13 +61,13 @@ extern "C" {
 #  endif /* __cplusplus */
 
 /* Initialize the algorithm. */
-void _cupsMD5Init(_cups_md5_state_t *pms);
+void _cupsMD5Init(_cups_md5_state_t *pms) _CUPS_PRIVATE;
 
 /* Append a string to the message. */
-void _cupsMD5Append(_cups_md5_state_t *pms, const unsigned char *data, int nbytes);
+void _cupsMD5Append(_cups_md5_state_t *pms, const unsigned char *data, int nbytes) _CUPS_PRIVATE;
 
 /* Finish the message and return the digest. */
-void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]);
+void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]) _CUPS_PRIVATE;
 
 #  ifdef __cplusplus
 }  /* end extern "C" */
index 1f864632b78c44a9537c2658458c6d4f75e7501f..9aa15059bf3f98666c06925ddbf5ba1519babe41 100644 (file)
@@ -155,59 +155,59 @@ struct _ppd_cache_s                       /**** PPD cache and PWG conversion data ****/
  * Prototypes...
  */
 
-extern int             _cupsConvertOptions(ipp_t *request, ppd_file_t *ppd, _ppd_cache_t *pc, ipp_attribute_t *media_col_sup, ipp_attribute_t *doc_handling_sup, ipp_attribute_t *print_color_mode_sup, const char *user, const char *format, int copies, int num_options, cups_option_t *options);
+extern int             _cupsConvertOptions(ipp_t *request, ppd_file_t *ppd, _ppd_cache_t *pc, ipp_attribute_t *media_col_sup, ipp_attribute_t *doc_handling_sup, ipp_attribute_t *print_color_mode_sup, const char *user, const char *format, int copies, int num_options, cups_option_t *options) _CUPS_PRIVATE;
 extern _ppd_cache_t    *_ppdCacheCreateWithFile(const char *filename,
-                                                ipp_t **attrs);
-extern _ppd_cache_t    *_ppdCacheCreateWithPPD(ppd_file_t *ppd);
-extern void            _ppdCacheDestroy(_ppd_cache_t *pc);
+                                                ipp_t **attrs) _CUPS_PRIVATE;
+extern _ppd_cache_t    *_ppdCacheCreateWithPPD(ppd_file_t *ppd) _CUPS_PRIVATE;
+extern void            _ppdCacheDestroy(_ppd_cache_t *pc) _CUPS_PRIVATE;
 extern const char      *_ppdCacheGetBin(_ppd_cache_t *pc,
-                                        const char *output_bin);
+                                        const char *output_bin) _CUPS_PRIVATE;
 extern int             _ppdCacheGetFinishingOptions(_ppd_cache_t *pc,
                                                     ipp_t *job,
                                                     ipp_finishings_t value,
                                                     int num_options,
-                                                    cups_option_t **options);
-extern int             _ppdCacheGetFinishingValues(ppd_file_t *ppd, _ppd_cache_t *pc, int max_values, int *values);
+                                                    cups_option_t **options) _CUPS_PRIVATE;
+extern int             _ppdCacheGetFinishingValues(ppd_file_t *ppd, _ppd_cache_t *pc, int max_values, int *values) _CUPS_PRIVATE;
 extern const char      *_ppdCacheGetInputSlot(_ppd_cache_t *pc, ipp_t *job,
-                                              const char *keyword);
+                                              const char *keyword) _CUPS_PRIVATE;
 extern const char      *_ppdCacheGetMediaType(_ppd_cache_t *pc, ipp_t *job,
-                                              const char *keyword);
+                                              const char *keyword) _CUPS_PRIVATE;
 extern const char      *_ppdCacheGetOutputBin(_ppd_cache_t *pc,
-                                              const char *keyword);
+                                              const char *keyword) _CUPS_PRIVATE;
 extern const char      *_ppdCacheGetPageSize(_ppd_cache_t *pc, ipp_t *job,
-                                             const char *keyword, int *exact);
+                                             const char *keyword, int *exact) _CUPS_PRIVATE;
 extern pwg_size_t      *_ppdCacheGetSize(_ppd_cache_t *pc,
-                                         const char *page_size);
+                                         const char *page_size) _CUPS_PRIVATE;
 extern const char      *_ppdCacheGetSource(_ppd_cache_t *pc,
-                                           const char *input_slot);
+                                           const char *input_slot) _CUPS_PRIVATE;
 extern const char      *_ppdCacheGetType(_ppd_cache_t *pc,
-                                         const char *media_type);
+                                         const char *media_type) _CUPS_PRIVATE;
 extern int             _ppdCacheWriteFile(_ppd_cache_t *pc,
-                                          const char *filename, ipp_t *attrs);
-extern char            *_ppdCreateFromIPP(char *buffer, size_t bufsize, ipp_t *response);
-extern void            _ppdFreeLanguages(cups_array_t *languages);
-extern cups_encoding_t _ppdGetEncoding(const char *name);
-extern cups_array_t    *_ppdGetLanguages(ppd_file_t *ppd);
-extern _ppd_globals_t  *_ppdGlobals(void);
-extern unsigned                _ppdHashName(const char *name);
+                                          const char *filename, ipp_t *attrs) _CUPS_PRIVATE;
+extern char            *_ppdCreateFromIPP(char *buffer, size_t bufsize, ipp_t *response) _CUPS_PRIVATE;
+extern void            _ppdFreeLanguages(cups_array_t *languages) _CUPS_PRIVATE;
+extern cups_encoding_t _ppdGetEncoding(const char *name) _CUPS_PRIVATE;
+extern cups_array_t    *_ppdGetLanguages(ppd_file_t *ppd) _CUPS_PRIVATE;
+extern _ppd_globals_t  *_ppdGlobals(void) _CUPS_PRIVATE;
+extern unsigned                _ppdHashName(const char *name) _CUPS_PRIVATE;
 extern ppd_attr_t      *_ppdLocalizedAttr(ppd_file_t *ppd, const char *keyword,
-                                          const char *spec, const char *ll_CC);
+                                          const char *spec, const char *ll_CC) _CUPS_PRIVATE;
 extern char            *_ppdNormalizeMakeAndModel(const char *make_and_model,
                                                   char *buffer,
-                                                  size_t bufsize);
+                                                  size_t bufsize) _CUPS_PRIVATE;
 extern ppd_file_t      *_ppdOpen(cups_file_t *fp,
-                                 _ppd_localization_t localization);
+                                 _ppd_localization_t localization) _CUPS_PRIVATE;
 extern ppd_file_t      *_ppdOpenFile(const char *filename,
-                                     _ppd_localization_t localization);
+                                     _ppd_localization_t localization) _CUPS_PRIVATE;
 extern int             _ppdParseOptions(const char *s, int num_options,
                                         cups_option_t **options,
-                                        _ppd_parse_t which);
+                                        _ppd_parse_t which) _CUPS_PRIVATE;
 extern const char      *_pwgInputSlotForSource(const char *media_source,
-                                               char *name, size_t namesize);
+                                               char *name, size_t namesize) _CUPS_PRIVATE;
 extern const char      *_pwgMediaTypeForType(const char *media_type,
-                                             char *name, size_t namesize);
+                                             char *name, size_t namesize) _CUPS_PRIVATE;
 extern const char      *_pwgPageSizeForMedia(pwg_media_t *media,
-                                             char *name, size_t namesize);
+                                             char *name, size_t namesize) _CUPS_PRIVATE;
 
 
 /*
index 995c6f52f3c8b8c1e57d090699ccaff18341dd9d..e93a7f879497667ad075a2933650412c28e8f39f 100644 (file)
@@ -38,8 +38,8 @@ extern void           _pwgGenerateSize(char *keyword, size_t keysize,
 extern int             _pwgInitSize(pwg_size_t *size, ipp_t *job,
                                     int *margins_set)
                                     _CUPS_INTERNAL_MSG("Use pwgInitSize instead.");
-extern const pwg_media_t *_pwgMediaTable(size_t *num_media);
-extern pwg_media_t *_pwgMediaNearSize(int width, int length, int epsilon);
+extern const pwg_media_t *_pwgMediaTable(size_t *num_media) _CUPS_PRIVATE;
+extern pwg_media_t *_pwgMediaNearSize(int width, int length, int epsilon) _CUPS_PRIVATE;
 
 #  ifdef __cplusplus
 }
index 9538f3998bb4d78c8a601f6754d4cfe352a79fe1..0cca21f9a8342a6e8a0e7530a96c48e54055f8dc 100644 (file)
@@ -44,9 +44,8 @@
  * Prototypes...
  */
 
-extern int             _cupsRasterExecPS(cups_page_header2_t *h, int *preferred_bits,
-                                         const char *code) _CUPS_NONNULL(3);
-extern void            _cupsRasterAddError(const char *f, ...) _CUPS_FORMAT(1,2);
-extern void            _cupsRasterClearError(void);
+extern int             _cupsRasterExecPS(cups_page_header2_t *h, int *preferred_bits, const char *code) _CUPS_NONNULL(3) _CUPS_PRIVATE;
+extern void            _cupsRasterAddError(const char *f, ...) _CUPS_FORMAT(1,2) _CUPS_PRIVATE;
+extern void            _cupsRasterClearError(void) _CUPS_PRIVATE;
 
 #endif /* !_CUPS_RASTER_PRIVATE_H_ */
index e417873a4c692825847d67e974e5c83e9128f688..36130195469367013c83adae5a14cc5f9886325d 100644 (file)
@@ -101,32 +101,32 @@ typedef void (*cups_snmp_cb_t)(cups_snmp_t *packet, void *data);
 extern "C" {
 #  endif /* __cplusplus */
 
-extern void            _cupsSNMPClose(int fd) _CUPS_API_1_4;
+extern void            _cupsSNMPClose(int fd) _CUPS_PRIVATE;
 extern int             *_cupsSNMPCopyOID(int *dst, const int *src, int dstsize)
-                           _CUPS_API_1_4;
-extern const char      *_cupsSNMPDefaultCommunity(void) _CUPS_API_1_4;
+                           _CUPS_PRIVATE;
+extern const char      *_cupsSNMPDefaultCommunity(void) _CUPS_PRIVATE;
 extern int             _cupsSNMPIsOID(cups_snmp_t *packet, const int *oid)
-                           _CUPS_API_1_4;
+                           _CUPS_PRIVATE;
 extern int             _cupsSNMPIsOIDPrefixed(cups_snmp_t *packet,
-                                             const int *prefix) _CUPS_API_1_4;
+                                             const int *prefix) _CUPS_PRIVATE;
 extern char            *_cupsSNMPOIDToString(const int *src, char *dst,
-                                             size_t dstsize) _CUPS_API_1_4;
-extern int             _cupsSNMPOpen(int family) _CUPS_API_1_4;
+                                             size_t dstsize) _CUPS_PRIVATE;
+extern int             _cupsSNMPOpen(int family) _CUPS_PRIVATE;
 extern cups_snmp_t     *_cupsSNMPRead(int fd, cups_snmp_t *packet,
-                                      double timeout) _CUPS_API_1_4;
-extern void            _cupsSNMPSetDebug(int level) _CUPS_API_1_4;
+                                      double timeout) _CUPS_PRIVATE;
+extern void            _cupsSNMPSetDebug(int level) _CUPS_PRIVATE;
 extern int             *_cupsSNMPStringToOID(const char *src,
                                              int *dst, int dstsize)
-                                             _CUPS_API_1_4;
+                                             _CUPS_PRIVATE;
 extern int             _cupsSNMPWalk(int fd, http_addr_t *address, int version,
                                      const char *community, const int *prefix,
                                      double timeout, cups_snmp_cb_t cb,
-                                     void *data) _CUPS_API_1_4;
+                                     void *data) _CUPS_PRIVATE;
 extern int             _cupsSNMPWrite(int fd, http_addr_t *address, int version,
                                       const char *community,
                                       cups_asn1_t request_type,
                                       const unsigned request_id,
-                                      const int *oid) _CUPS_API_1_4;
+                                      const int *oid) _CUPS_PRIVATE;
 
 #  ifdef __cplusplus
 }
index 6a0394663eb00faf8f3cfdcb110058f0ace116b5..300da93765e690925a4c47a14125e5fdea2f12a0 100644 (file)
@@ -24,6 +24,7 @@
 #  include <time.h>
 
 #  include "config.h"
+#  include <cups/versioning.h>
 
 #  ifdef HAVE_STRING_H
 #    include <string.h>
@@ -147,35 +148,35 @@ extern int _cups_toupper(int ch);
  * Prototypes...
  */
 
-extern ssize_t _cups_safe_vsnprintf(char *, size_t, const char *, va_list);
-extern void    _cups_strcpy(char *dst, const char *src);
+extern ssize_t _cups_safe_vsnprintf(char *, size_t, const char *, va_list) _CUPS_PRIVATE;
+extern void    _cups_strcpy(char *dst, const char *src) _CUPS_PRIVATE;
 
 #  ifndef HAVE_STRDUP
-extern char    *_cups_strdup(const char *);
+extern char    *_cups_strdup(const char *) _CUPS_PRIVATE;
 #    define strdup _cups_strdup
 #  endif /* !HAVE_STRDUP */
 
-extern int     _cups_strcasecmp(const char *, const char *);
+extern int     _cups_strcasecmp(const char *, const char *) _CUPS_PRIVATE;
 
-extern int     _cups_strncasecmp(const char *, const char *, size_t n);
+extern int     _cups_strncasecmp(const char *, const char *, size_t n) _CUPS_PRIVATE;
 
 #  ifndef HAVE_STRLCAT
-extern size_t _cups_strlcat(char *, const char *, size_t);
+extern size_t _cups_strlcat(char *, const char *, size_t) _CUPS_PRIVATE;
 #    define strlcat _cups_strlcat
 #  endif /* !HAVE_STRLCAT */
 
 #  ifndef HAVE_STRLCPY
-extern size_t _cups_strlcpy(char *, const char *, size_t);
+extern size_t _cups_strlcpy(char *, const char *, size_t) _CUPS_PRIVATE;
 #    define strlcpy _cups_strlcpy
 #  endif /* !HAVE_STRLCPY */
 
 #  ifndef HAVE_SNPRINTF
-extern int     _cups_snprintf(char *, size_t, const char *, ...) _CUPS_FORMAT(3, 4);
+extern int     _cups_snprintf(char *, size_t, const char *, ...) _CUPS_FORMAT(3, 4) _CUPS_PRIVATE;
 #    define snprintf _cups_snprintf
 #  endif /* !HAVE_SNPRINTF */
 
 #  ifndef HAVE_VSNPRINTF
-extern int     _cups_vsnprintf(char *, size_t, const char *, va_list);
+extern int     _cups_vsnprintf(char *, size_t, const char *, va_list) _CUPS_PRIVATE;
 #    define vsnprintf _cups_vsnprintf
 #  endif /* !HAVE_VSNPRINTF */
 
@@ -183,11 +184,11 @@ extern int        _cups_vsnprintf(char *, size_t, const char *, va_list);
  * String pool functions...
  */
 
-extern char    *_cupsStrAlloc(const char *s);
-extern void    _cupsStrFlush(void);
-extern void    _cupsStrFree(const char *s);
-extern char    *_cupsStrRetain(const char *s);
-extern size_t  _cupsStrStatistics(size_t *alloc_bytes, size_t *total_bytes);
+extern char    *_cupsStrAlloc(const char *s) _CUPS_PRIVATE;
+extern void    _cupsStrFlush(void) _CUPS_PRIVATE;
+extern void    _cupsStrFree(const char *s) _CUPS_PRIVATE;
+extern char    *_cupsStrRetain(const char *s) _CUPS_PRIVATE;
+extern size_t  _cupsStrStatistics(size_t *alloc_bytes, size_t *total_bytes) _CUPS_PRIVATE;
 
 
 /*
@@ -195,16 +196,16 @@ extern size_t     _cupsStrStatistics(size_t *alloc_bytes, size_t *total_bytes);
  */
 
 extern char    *_cupsStrFormatd(char *buf, char *bufend, double number,
-                                struct lconv *loc);
+                                struct lconv *loc) _CUPS_PRIVATE;
 extern double  _cupsStrScand(const char *buf, char **bufptr,
-                             struct lconv *loc);
+                             struct lconv *loc) _CUPS_PRIVATE;
 
 
 /*
  * Date function...
  */
 
-extern char    *_cupsStrDate(char *buf, size_t bufsize, time_t timeval);
+extern char    *_cupsStrDate(char *buf, size_t bufsize, time_t timeval) _CUPS_PRIVATE;
 
 
 /*
index 69617b536adc84322b9b0d4f7bf318b17e1d79ed..1952294215185ca84d99e210d226ff9bf7b6f04e 100644 (file)
@@ -81,20 +81,20 @@ typedef void        *_cups_threadkey_t;
  * Functions...
  */
 
-extern void    _cupsCondBroadcast(_cups_cond_t *cond);
-extern void    _cupsCondInit(_cups_cond_t *cond);
-extern void    _cupsCondWait(_cups_cond_t *cond, _cups_mutex_t *mutex, double timeout);
-extern void    _cupsMutexInit(_cups_mutex_t *mutex);
-extern void    _cupsMutexLock(_cups_mutex_t *mutex);
-extern void    _cupsMutexUnlock(_cups_mutex_t *mutex);
-extern void    _cupsRWInit(_cups_rwlock_t *rwlock);
-extern void    _cupsRWLockRead(_cups_rwlock_t *rwlock);
-extern void    _cupsRWLockWrite(_cups_rwlock_t *rwlock);
-extern void    _cupsRWUnlock(_cups_rwlock_t *rwlock);
-extern void    _cupsThreadCancel(_cups_thread_t thread);
-extern _cups_thread_t _cupsThreadCreate(_cups_thread_func_t func, void *arg);
-extern void     _cupsThreadDetach(_cups_thread_t thread);
-extern void    *_cupsThreadWait(_cups_thread_t thread);
+extern void    _cupsCondBroadcast(_cups_cond_t *cond) _CUPS_PRIVATE;
+extern void    _cupsCondInit(_cups_cond_t *cond) _CUPS_PRIVATE;
+extern void    _cupsCondWait(_cups_cond_t *cond, _cups_mutex_t *mutex, double timeout) _CUPS_PRIVATE;
+extern void    _cupsMutexInit(_cups_mutex_t *mutex) _CUPS_PRIVATE;
+extern void    _cupsMutexLock(_cups_mutex_t *mutex) _CUPS_PRIVATE;
+extern void    _cupsMutexUnlock(_cups_mutex_t *mutex) _CUPS_PRIVATE;
+extern void    _cupsRWInit(_cups_rwlock_t *rwlock) _CUPS_PRIVATE;
+extern void    _cupsRWLockRead(_cups_rwlock_t *rwlock) _CUPS_PRIVATE;
+extern void    _cupsRWLockWrite(_cups_rwlock_t *rwlock) _CUPS_PRIVATE;
+extern void    _cupsRWUnlock(_cups_rwlock_t *rwlock) _CUPS_PRIVATE;
+extern void    _cupsThreadCancel(_cups_thread_t thread) _CUPS_PRIVATE;
+extern _cups_thread_t _cupsThreadCreate(_cups_thread_func_t func, void *arg) _CUPS_PRIVATE;
+extern void     _cupsThreadDetach(_cups_thread_t thread) _CUPS_PRIVATE;
+extern void    *_cupsThreadWait(_cups_thread_t thread) _CUPS_PRIVATE;
 
 #  ifdef __cplusplus
 }
index d187a71cfeede1e10018be3b587ad1ad73dbb70d..1ee7b78c49cdc547d05f1ebc6dda4fbde271af72 100644 (file)
@@ -22,7 +22,9 @@
  *   - _CUPS_FORMAT(format-index, additional-args-index): Function has a
  *     printf-style format argument followed by zero or more additional
  *     arguments.  Indices start at 1.
- *   - _CUPS_INTERNAL_MSG("msg"): Function is
+ *   - _CUPS_INTERNAL: Function is internal with no replacement API.
+ *   - _CUPS_INTERNAL_MSG("msg"): Function is internal - use specified API
+ *     instead.
  *   - _CUPS_NONNULL((arg list)): Specifies the comma-separated argument indices
  *     are assumed non-NULL.  Indices start at 1.
  *   - _CUPS_NORETURN: Specifies the function does not return.
 
 
 /*
- * Define _CUPS_PRIVATE and _CUPS_PUBLIC visibilty macros for private/public
- * functions...
+ * Define _CUPS_INTERNAL, _CUPS_PRIVATE, and _CUPS_PUBLIC visibilty macros for
+ * internal/private/public functions...
  */
 
 #  ifdef _CUPS_HAS_VISIBILITY
-#    define _CUPS_PRIVATE      __attribute__ ((visibility("hidden")))
+#    define _CUPS_INTERNAL     __attribute__ ((visibility("hidden")))
+#    define _CUPS_PRIVATE      __attribute__ ((visibility("default")))
 #    define _CUPS_PUBLIC       __attribute__ ((visibility("default")))
 #  elif defined(_WIN32) && defined(LIBCUPS2_EXPORTS)
-#    define _CUPS_PRIVATE
+#    define _CUPS_INTERNAL
+#    define _CUPS_PRIVATE      __declspec(dllexport)
 #    define _CUPS_PUBLIC       __declspec(dllexport)
 #  else
+#    define _CUPS_INTERNAL
 #    define _CUPS_PRIVATE
 #    define _CUPS_PUBLIC
 #  endif /* _CUPS_HAS_VISIBILITY */