Merge changes from CUPS 1.5svn-r9098.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2056 a1ca3aef-8c08-0410-bb20-df032aa958be

1 files changed, 313 insertions, 312 deletions

diff --git a/cups/libcups2.def b/cups/libcups2.def
index 83d33f382..825d12e68 100644
--- a/cups/libcups2.def
+++ b/cups/libcups2.def
@@ -1,312 +1,313 @@
-LIBRARY libcups2
-VERSION 2.8
-EXPORTS
-_cupsCharmapFlush
-_cupsCharmapFree
-_cupsCharmapGet
-_cupsEncodingName
-_cupsGetPassword
-_cupsGlobals
-_cupsLangPrintf
-_cupsLangPuts
-_cupsLangString
-_cupsMD5Append
-_cupsMD5Finish
-_cupsMD5Init
-_cupsMessageFree
-_cupsMessageLoad
-_cupsMessageLookup
-_cupsSetError
-_cupsSetLocale
-_cupsStrAlloc
-_cupsStrFlush
-_cupsStrFormatd
-_cupsStrFree
-_cupsStrScand
-_cupsStrStatistics
-_cups_strcpy
-_cups_strlcat
-_cups_strlcpy
-_httpResolveURI
-_ippAddAttr
-_ippFindOption
-_ippFreeAttr
-_ppdFreeLanguages
-_ppdGetEncoding
-_ppdGetLanguages
-_ppdHashName
-_pwgCreateWithFile
-_pwgDestroy
-_pwgWriteFile
-_pwgGenerateSize
-_pwgInitSize
-_pwgMediaForLegacy
-_pwgMediaForPPD
-_pwgMediaForPWG
-_pwgMediaForSize
-_pwgCreateWithPPD
-_pwgGetInputSlot
-_pwgGetMediaType
-_pwgGetPageSize
-_pwgGetSize
-_pwgGetSource
-_pwgGetType
-_pwgInputSlotForSource
-_pwgMediaTypeForType
-_pwgPageSizeForMedia
-cupsAddDest
-cupsAddOption
-cupsAdminCreateWindowsPPD
-cupsAdminExportSamba
-cupsArrayAdd
-cupsArrayClear
-cupsArrayCount
-cupsArrayCurrent
-cupsArrayDelete
-cupsArrayDup
-cupsArrayFind
-cupsArrayFirst
-cupsArrayIndex
-cupsArrayInsert
-cupsArrayLast
-cupsArrayNew
-cupsArrayNext
-cupsArrayPrev
-cupsArrayRemove
-cupsArrayRestore
-cupsArraySave
-cupsArrayUserData
-cupsCancelJob
-cupsCharsetToUTF8
-cupsDirClose
-cupsDirOpen
-cupsDirRead
-cupsDirRewind
-cupsDoAuthentication
-cupsDoFileRequest
-cupsDoIORequest
-cupsDoRequest
-cupsEncodeOptions
-cupsEncodeOptions2
-cupsEncryption
-cupsFileClose
-cupsFileCompression
-cupsFileEOF
-cupsFileFind
-cupsFileFlush
-cupsFileGetChar
-cupsFileGetConf
-cupsFileGetLine
-cupsFileGets
-cupsFileLock
-cupsFileNumber
-cupsFileOpen
-cupsFileOpenFd
-cupsFilePeekChar
-cupsFilePrintf
-cupsFilePutChar
-cupsFilePuts
-cupsFileRead
-cupsFileRewind
-cupsFileSeek
-cupsFileStderr
-cupsFileStdin
-cupsFileStdout
-cupsFileTell
-cupsFileUnlock
-cupsFileWrite
-cupsFreeDests
-cupsFreeJobs
-cupsFreeOptions
-cupsGetClasses
-cupsGetDefault
-cupsGetDefault2
-cupsGetDest
-cupsGetDests
-cupsGetDests2
-cupsGetFd
-cupsGetFile
-cupsGetJobs
-cupsGetJobs2
-cupsGetOption
-cupsGetPPD
-cupsGetPPD2
-cupsGetPassword
-cupsGetPrinters
-cupsGetResponse
-cupsLangDefault
-cupsLangEncoding
-cupsLangFlush
-cupsLangFree
-cupsLangGet
-cupsLastError
-cupsLastErrorString
-cupsMarkOptions
-cupsNotifySubject
-cupsNotifyText
-cupsParseOptions
-cupsPrintFile
-cupsPrintFile2
-cupsPrintFiles
-cupsPrintFiles2
-cupsPutFd
-cupsPutFile
-cupsRemoveOption
-cupsResolveConflicts
-cupsSendRequest
-cupsServer
-cupsSetDests
-cupsSetDests2
-cupsSetEncryption
-cupsSetPasswordCB
-cupsSetServer
-cupsSetUser
-cupsTempFd
-cupsTempFile
-cupsTempFile2
-cupsUTF32ToUTF8
-cupsUTF8ToCharset
-cupsUTF8ToUTF32
-cupsUser
-cupsWriteRequestData
-httpAddrAny
-httpAddrConnect
-httpAddrEqual
-httpAddrFreeList
-httpAddrGetList
-httpAddrLength
-httpAddrLocalhost
-httpAddrLookup
-httpAddrString
-httpAssembleURI
-httpAssembleURIf
-httpBlocking
-httpCheck
-httpClearCookie
-httpClearFields
-httpClose
-httpConnect
-httpConnectEncrypt
-httpDecode64
-httpDecode64_2
-httpDelete
-httpEncode64
-httpEncode64_2
-httpEncryption
-httpError
-httpFlush
-httpFlushWrite
-httpGet
-httpGetBlocking
-httpGetCookie
-httpGetDateString
-httpGetDateString2
-httpGetDateTime
-httpGetFd
-httpGetField
-httpGetHostByName
-httpGetHostname
-httpGetLength
-httpGetLength2
-httpGetStatus
-httpGetSubField
-httpGetSubField2
-httpGets
-httpHead
-httpInitialize
-httpMD5
-httpMD5Final
-httpMD5String
-httpOptions
-httpPost
-httpPrintf
-httpPut
-httpRead
-httpRead2
-httpReconnect
-httpSeparate
-httpSeparate2
-httpSeparateURI
-httpSetCookie
-httpSetExpect
-httpSetField
-httpSetLength
-httpStatus
-httpTrace
-httpUpdate
-httpWait
-httpWrite
-httpWrite2
-ippAddBoolean
-ippAddBooleans
-ippAddCollection
-ippAddCollections
-ippAddDate
-ippAddInteger
-ippAddIntegers
-ippAddOctetString
-ippAddRange
-ippAddRanges
-ippAddResolution
-ippAddResolutions
-ippAddSeparator
-ippAddString
-ippAddStrings
-ippDateToTime
-ippDelete
-ippDeleteAttribute
-ippErrorString
-ippErrorValue
-ippFindAttribute
-ippFindNextAttribute
-ippLength
-ippNew
-ippNewRequest
-ippOpString
-ippOpValue
-ippPort
-ippRead
-ippReadFile
-ippReadIO
-ippSetPort
-ippTagString
-ippTagValue
-ippTimeToDate
-ippWrite
-ippWriteFile
-ippWriteIO
-ppdClose
-ppdCollect
-ppdCollect2
-ppdConflicts
-ppdEmit
-ppdEmitAfterOrder
-ppdEmitFd
-ppdEmitJCL
-ppdEmitJCLEnd
-ppdEmitString
-ppdErrorString
-ppdFindAttr
-ppdFindChoice
-ppdFindCustomOption
-ppdFindCustomParam
-ppdFindMarkedChoice
-ppdFindNextAttr
-ppdFindOption
-ppdFirstCustomParam
-ppdFirstOption
-ppdIsMarked
-ppdLastError
-ppdLocalize
-ppdMarkDefaults
-ppdMarkOption
-ppdNextCustomParam
-ppdNextOption
-ppdOpen
-ppdOpen2
-ppdOpenFd
-ppdOpenFile
-ppdPageLength
-ppdPageSize
-ppdPageWidth
-ppdSetConformance
+LIBRARY libcups2

+VERSION 2.8

+EXPORTS

+_cupsCharmapFlush

+_cupsCharmapFree

+_cupsCharmapGet

+_cupsEncodingName

+_cupsGetPassword

+_cupsGlobals

+_cupsLangPrintf

+_cupsLangPuts

+_cupsLangString

+_cupsMD5Append

+_cupsMD5Finish

+_cupsMD5Init

+_cupsMessageFree

+_cupsMessageLoad

+_cupsMessageLookup

+_cupsSetError

+_cupsSetLocale

+_cupsStrAlloc

+_cupsStrFlush

+_cupsStrFormatd

+_cupsStrFree

+_cupsStrScand

+_cupsStrStatistics

+_cups_strcpy

+_cups_strlcat

+_cups_strlcpy

+_httpResolveURI

+_ippAddAttr

+_ippAttrString

+_ippFindOption

+_ippFreeAttr

+_ppdFreeLanguages

+_ppdGetEncoding

+_ppdGetLanguages

+_ppdHashName

+_pwgCreateWithFile

+_pwgDestroy

+_pwgWriteFile

+_pwgGenerateSize

+_pwgInitSize

+_pwgMediaForLegacy

+_pwgMediaForPPD

+_pwgMediaForPWG

+_pwgMediaForSize

+_pwgCreateWithPPD

+_pwgGetInputSlot

+_pwgGetMediaType

+_pwgGetPageSize

+_pwgGetSize

+_pwgGetSource

+_pwgGetType

+_pwgInputSlotForSource

+_pwgMediaTypeForType

+_pwgPageSizeForMedia

+cupsAddDest

+cupsAddOption

+cupsAdminCreateWindowsPPD

+cupsAdminExportSamba

+cupsArrayAdd

+cupsArrayClear

+cupsArrayCount

+cupsArrayCurrent

+cupsArrayDelete

+cupsArrayDup

+cupsArrayFind

+cupsArrayFirst

+cupsArrayIndex

+cupsArrayInsert

+cupsArrayLast

+cupsArrayNew

+cupsArrayNext

+cupsArrayPrev

+cupsArrayRemove

+cupsArrayRestore

+cupsArraySave

+cupsArrayUserData

+cupsCancelJob

+cupsCharsetToUTF8

+cupsDirClose

+cupsDirOpen

+cupsDirRead

+cupsDirRewind

+cupsDoAuthentication

+cupsDoFileRequest

+cupsDoIORequest

+cupsDoRequest

+cupsEncodeOptions

+cupsEncodeOptions2

+cupsEncryption

+cupsFileClose

+cupsFileCompression

+cupsFileEOF

+cupsFileFind

+cupsFileFlush

+cupsFileGetChar

+cupsFileGetConf

+cupsFileGetLine

+cupsFileGets

+cupsFileLock

+cupsFileNumber

+cupsFileOpen

+cupsFileOpenFd

+cupsFilePeekChar

+cupsFilePrintf

+cupsFilePutChar

+cupsFilePuts

+cupsFileRead

+cupsFileRewind

+cupsFileSeek

+cupsFileStderr

+cupsFileStdin

+cupsFileStdout

+cupsFileTell

+cupsFileUnlock

+cupsFileWrite

+cupsFreeDests

+cupsFreeJobs

+cupsFreeOptions

+cupsGetClasses

+cupsGetDefault

+cupsGetDefault2

+cupsGetDest

+cupsGetDests

+cupsGetDests2

+cupsGetFd

+cupsGetFile

+cupsGetJobs

+cupsGetJobs2

+cupsGetOption

+cupsGetPPD

+cupsGetPPD2

+cupsGetPassword

+cupsGetPrinters

+cupsGetResponse

+cupsLangDefault

+cupsLangEncoding

+cupsLangFlush

+cupsLangFree

+cupsLangGet

+cupsLastError

+cupsLastErrorString

+cupsMarkOptions

+cupsNotifySubject

+cupsNotifyText

+cupsParseOptions

+cupsPrintFile

+cupsPrintFile2

+cupsPrintFiles

+cupsPrintFiles2

+cupsPutFd

+cupsPutFile

+cupsRemoveOption

+cupsResolveConflicts

+cupsSendRequest

+cupsServer

+cupsSetDests

+cupsSetDests2

+cupsSetEncryption

+cupsSetPasswordCB

+cupsSetServer

+cupsSetUser

+cupsTempFd

+cupsTempFile

+cupsTempFile2

+cupsUTF32ToUTF8

+cupsUTF8ToCharset

+cupsUTF8ToUTF32

+cupsUser

+cupsWriteRequestData

+httpAddrAny

+httpAddrConnect

+httpAddrEqual

+httpAddrFreeList

+httpAddrGetList

+httpAddrLength

+httpAddrLocalhost

+httpAddrLookup

+httpAddrString

+httpAssembleURI

+httpAssembleURIf

+httpBlocking

+httpCheck

+httpClearCookie

+httpClearFields

+httpClose

+httpConnect

+httpConnectEncrypt

+httpDecode64

+httpDecode64_2

+httpDelete

+httpEncode64

+httpEncode64_2

+httpEncryption

+httpError

+httpFlush

+httpFlushWrite

+httpGet

+httpGetBlocking

+httpGetCookie

+httpGetDateString

+httpGetDateString2

+httpGetDateTime

+httpGetFd

+httpGetField

+httpGetHostByName

+httpGetHostname

+httpGetLength

+httpGetLength2

+httpGetStatus

+httpGetSubField

+httpGetSubField2

+httpGets

+httpHead

+httpInitialize

+httpMD5

+httpMD5Final

+httpMD5String

+httpOptions

+httpPost

+httpPrintf

+httpPut

+httpRead

+httpRead2

+httpReconnect

+httpSeparate

+httpSeparate2

+httpSeparateURI

+httpSetCookie

+httpSetExpect

+httpSetField

+httpSetLength

+httpStatus

+httpTrace

+httpUpdate

+httpWait

+httpWrite

+httpWrite2

+ippAddBoolean

+ippAddBooleans

+ippAddCollection

+ippAddCollections

+ippAddDate

+ippAddInteger

+ippAddIntegers

+ippAddOctetString

+ippAddRange

+ippAddRanges

+ippAddResolution

+ippAddResolutions

+ippAddSeparator

+ippAddString

+ippAddStrings

+ippDateToTime

+ippDelete

+ippDeleteAttribute

+ippErrorString

+ippErrorValue

+ippFindAttribute

+ippFindNextAttribute

+ippLength

+ippNew

+ippNewRequest

+ippOpString

+ippOpValue

+ippPort

+ippRead

+ippReadFile

+ippReadIO

+ippSetPort

+ippTagString

+ippTagValue

+ippTimeToDate

+ippWrite

+ippWriteFile

+ippWriteIO

+ppdClose

+ppdCollect

+ppdCollect2

+ppdConflicts

+ppdEmit

+ppdEmitAfterOrder

+ppdEmitFd

+ppdEmitJCL

+ppdEmitJCLEnd

+ppdEmitString

+ppdErrorString

+ppdFindAttr

+ppdFindChoice

+ppdFindCustomOption

+ppdFindCustomParam

+ppdFindMarkedChoice

+ppdFindNextAttr

+ppdFindOption

+ppdFirstCustomParam

+ppdFirstOption

+ppdIsMarked

+ppdLastError

+ppdLocalize

+ppdMarkDefaults

+ppdMarkOption

+ppdNextCustomParam

+ppdNextOption

+ppdOpen

+ppdOpen2

+ppdOpenFd

+ppdOpenFile

+ppdPageLength

+ppdPageSize

+ppdPageWidth

+ppdSetConformance