diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-03-30 05:59:14 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-03-30 05:59:14 +0000 |
commit | 82cc1f9ac32564e92bfbbe7a1de416f4ebcc8584 (patch) | |
tree | af43377451e06dac91d6639e35b1b5bf41d14d4e /cups/cups-private.h | |
parent | 3e7fe0ca760ad0054cf5c9ec7c90ca415cf6eb06 (diff) |
Merge changes from CUPS 1.6svn-r10390.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3755 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 e2ae33741..e2c0239ad 100644 --- a/cups/cups-private.h +++ b/cups/cups-private.h @@ -22,15 +22,15 @@ * Include necessary headers... */ -# include <cups/cups.h> # include "string-private.h" # include "debug-private.h" -# include "ppd-private.h" -# include "http-private.h" # include "ipp-private.h" +# include "http-private.h" # include "language-private.h" # include "pwg-private.h" +# include "ppd-private.h" # include "thread-private.h" +# include <cups/cups.h> # ifdef __APPLE__ # include <sys/cdefs.h> # include <CoreFoundation/CoreFoundation.h> |