diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-07 22:31:27 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-07 22:31:27 +0000 |
commit | 85dda01c84763aecc4d31e15246d0ac5986eedae (patch) | |
tree | 4f8b999e8443b1c8def8c79d70338bd4e0179e29 /scheduler/cupsd.h | |
parent | a48458814a4c26a6430b27105c0ab747c907473f (diff) | |
download | cups-85dda01c84763aecc4d31e15246d0ac5986eedae.tar.gz |
Merge changes from CUPS 1.6svn-r9968.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3411 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'scheduler/cupsd.h')
-rw-r--r-- | scheduler/cupsd.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index d742467a7..630285f3e 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -183,10 +183,7 @@ extern void cupsdInitEnv(void); extern int cupsdLoadEnv(char *envp[], int envmax); extern void cupsdSetEnv(const char *name, const char *value); extern void cupsdSetEnvf(const char *name, const char *value, ...) -#ifdef __GNUC__ -__attribute__ ((__format__ (__printf__, 2, 3))) -#endif /* __GNUC__ */ -; + __attribute__ ((__format__ (__printf__, 2, 3))); extern void cupsdUpdateEnv(void); /* file.c */ @@ -210,10 +207,7 @@ extern char *cupsdMakeUUID(const char *name, int number, extern void cupsdReleaseSignals(void); extern void cupsdSetString(char **s, const char *v); extern void cupsdSetStringf(char **s, const char *f, ...) -#ifdef __GNUC__ -__attribute__ ((__format__ (__printf__, 2, 3))) -#endif /* __GNUC__ */ -; + __attribute__ ((__format__ (__printf__, 2, 3))); /* process.c */ extern void *cupsdCreateProfile(int job_id); |