Merge changes from CUPS 1.4svn-r8606.

[thirdparty/cups.git] / cups / libcups.exp

diff --git a/cups/libcups.exp b/cups/libcups.exp
index 35f3094318c5ec8bf51b969890da753d4511b082..16fa94d1df61940dbd85100ea673b944a97349a1 100644 (file)
--- a/cups/libcups.exp
+++ b/cups/libcups.exp
@@ -1,3 +1,6 @@
+__cups_debug_fd
+__cups_debug_printf
+__cups_debug_puts
 __cups_strcpy
 __cupsAdminGetServerSettings
 __cupsAdminSetServerSettings
@@ -18,24 +21,47 @@ __cupsMD5Init
 __cupsMessageFree
 __cupsMessageLoad
 __cupsMessageLookup
+__cupsPWGMediaByName
+__cupsPWGMediaByLegacy
+__cupsPWGMediaBySize
 __cupsSetError
 __cupsSetLocale
+__cupsSNMPClose
+__cupsSNMPCopyOID
+__cupsSNMPDefaultCommunity
+__cupsSNMPIsOID
+__cupsSNMPIsOIDPrefixed
+__cupsSNMPOIDToString
+__cupsSNMPOpen
+__cupsSNMPRead
+__cupsSNMPSetDebug
+__cupsSNMPStringToOID
+__cupsSNMPWalk
+__cupsSNMPWrite
 __cupsStrAlloc
 __cupsStrFlush
 __cupsStrFormatd
 __cupsStrFree
+__cupsStrRetain
 __cupsStrScand
 __cupsStrStatistics
+__httpAddrPort
+__httpCreate
+__httpEncodeURI
 __httpReadCDSA
+__httpResolveURI
 __httpWriteCDSA
 __ippAddAttr
 __ippFindOption
 __ippFreeAttr
 __ppdFreeLanguages
+__ppdGet1284Values
 __ppdGetEncoding
 __ppdGetLanguages
 __ppdHashName
 __ppdLocalizedAttr
+__ppdNormalizeMakeAndModel
+__ppdParseOptions
 _cupsAddDest
 _cupsAddOption
 _cupsAdminCreateWindowsPPD
@@ -66,6 +92,7 @@ _cupsArrayUserData
 _cupsBackChannelRead
 _cupsBackChannelWrite
 _cupsBackendDeviceURI
+_cupsBackendReport
 _cupsCancelJob
 _cupsCancelJob2
 _cupsCharsetToUTF8
@@ -97,6 +124,7 @@ _cupsFileOpenFd
 _cupsFilePeekChar
 _cupsFilePrintf
 _cupsFilePutChar
+_cupsFilePutConf
 _cupsFilePuts
 _cupsFileRead
 _cupsFileRewind
@@ -112,11 +140,13 @@ _cupsFreeDests
 _cupsFreeJobs
 _cupsFreeOptions
 _cupsGetClasses
+_cupsGetConflicts
 _cupsGetDefault
 _cupsGetDefault2
 _cupsGetDest
 _cupsGetDests
 _cupsGetDests2
+_cupsGetDevices
 _cupsGetFd
 _cupsGetFile
 _cupsGetJobs
@@ -124,6 +154,7 @@ _cupsGetJobs2
 _cupsGetNamedDest
 _cupsGetOption
 _cupsGetPassword
+_cupsGetPassword2
 _cupsGetPPD
 _cupsGetPPD2
 _cupsGetPPD3
@@ -150,16 +181,7 @@ _cupsPutFile
 _cupsReadResponseData
 _cupsRemoveDest
 _cupsRemoveOption
-_cupsSNMPClose
-_cupsSNMPCopyOID
-_cupsSNMPDefaultCommunity
-_cupsSNMPIsOID
-_cupsSNMPIsOIDPrefixed
-_cupsSNMPOpen
-_cupsSNMPRead
-_cupsSNMPSetDebug
-_cupsSNMPWalk
-_cupsSNMPWrite
+_cupsResolveConflicts
 _cupsSendRequest
 _cupsServer
 _cupsSetDefaultDest
@@ -167,11 +189,14 @@ _cupsSetDests
 _cupsSetDests2
 _cupsSetEncryption
 _cupsSetPasswordCB
+_cupsSetPasswordCB2
 _cupsSetServer
 _cupsSetUser
 _cupsSideChannelDoRequest
 _cupsSideChannelRead
 _cupsSideChannelWrite
+_cupsSideChannelSNMPGet
+_cupsSideChannelSNMPWalk
 _cupsStartDocument
 _cupsTempFd
 _cupsTempFile
@@ -283,6 +308,8 @@ _ippRead
 _ippReadFile
 _ippReadIO
 _ippSetPort
+_ippTagString
+_ippTagValue
 _ippTimeToDate
 _ippWrite
 _ippWriteFile
@@ -307,9 +334,11 @@ _ppdFindNextAttr
 _ppdFindOption
 _ppdFirstCustomParam
 _ppdFirstOption
+_ppdInstallableConflict
 _ppdIsMarked
 _ppdLastError
 _ppdLocalize
+_ppdLocalizeAttr
 _ppdLocalizeIPPReason
 _ppdLocalizeMarkerName
 _ppdMarkDefaults
@@ -322,5 +351,6 @@ _ppdOpenFd
 _ppdOpenFile
 _ppdPageLength
 _ppdPageSize
+_ppdPageSizeLimits
 _ppdPageWidth
 _ppdSetConformance