diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-04-12 04:23:14 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-04-12 04:23:14 +0000 |
| commit | 6d2f911bdd077fee9489b1084b960c4e68fc0658 (patch) | |
| tree | 3da5defca13981b9eef673bbd8dbe639f9233c0a /cups/cups-private.h | |
| parent | 39ff2fe72b9fc06ae7acc909584f87874f3a71b8 (diff) | |
| download | cups-6d2f911bdd077fee9489b1084b960c4e68fc0658.tar.gz | |
Merge changes from CUPS 1.5svn-r9105.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2070 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/cups-private.h')
| -rw-r--r-- | cups/cups-private.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cups/cups-private.h b/cups/cups-private.h index 0a0e9e2bc..051d3c4a9 100644 --- a/cups/cups-private.h +++ b/cups/cups-private.h @@ -30,9 +30,7 @@ # include "ipp-private.h" # include "language-private.h" # include "pwg-private.h" -# ifdef HAVE_PTHREAD_H -# include <pthread.h> -# endif /* HAVE_PTHREAD_H */ +# include "thread-private.h" /* @@ -150,7 +148,9 @@ extern http_t *_cupsConnect(void); extern int _cupsGet1284Values(const char *device_id, cups_option_t **values); extern const char *_cupsGetPassword(const char *prompt); +extern void _cupsGlobalLock(void); extern _cups_globals_t *_cupsGlobals(void); +extern void _cupsGlobalUnlock(void); extern void _cupsSetDefaults(void); extern void _cupsSetError(ipp_status_t status, const char *message, int localize); |