Merge changes from CUPS 1.4svn-r8606.

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

diff --git a/cups/libcups.exp b/cups/libcups.exp
index ff0dd054212bd74d5a56a74187fb016b36819e07..16fa94d1df61940dbd85100ea673b944a97349a1 100644 (file)
--- a/cups/libcups.exp
+++ b/cups/libcups.exp
@@ -1,3 +1,4 @@
+__cups_debug_fd
 __cups_debug_printf
 __cups_debug_puts
 __cups_strcpy
@@ -20,6 +21,9 @@ __cupsMD5Init
 __cupsMessageFree
 __cupsMessageLoad
 __cupsMessageLookup
+__cupsPWGMediaByName
+__cupsPWGMediaByLegacy
+__cupsPWGMediaBySize
 __cupsSetError
 __cupsSetLocale
 __cupsSNMPClose
@@ -38,8 +42,11 @@ __cupsStrAlloc
 __cupsStrFlush
 __cupsStrFormatd
 __cupsStrFree
+__cupsStrRetain
 __cupsStrScand
 __cupsStrStatistics
+__httpAddrPort
+__httpCreate
 __httpEncodeURI
 __httpReadCDSA
 __httpResolveURI
@@ -54,6 +61,7 @@ __ppdGetLanguages
 __ppdHashName
 __ppdLocalizedAttr
 __ppdNormalizeMakeAndModel
+__ppdParseOptions
 _cupsAddDest
 _cupsAddOption
 _cupsAdminCreateWindowsPPD
@@ -84,6 +92,7 @@ _cupsArrayUserData
 _cupsBackChannelRead
 _cupsBackChannelWrite
 _cupsBackendDeviceURI
+_cupsBackendReport
 _cupsCancelJob
 _cupsCancelJob2
 _cupsCharsetToUTF8
@@ -115,6 +124,7 @@ _cupsFileOpenFd
 _cupsFilePeekChar
 _cupsFilePrintf
 _cupsFilePutChar
+_cupsFilePutConf
 _cupsFilePuts
 _cupsFileRead
 _cupsFileRewind
@@ -130,6 +140,7 @@ _cupsFreeDests
 _cupsFreeJobs
 _cupsFreeOptions
 _cupsGetClasses
+_cupsGetConflicts
 _cupsGetDefault
 _cupsGetDefault2
 _cupsGetDest
@@ -143,6 +154,7 @@ _cupsGetJobs2
 _cupsGetNamedDest
 _cupsGetOption
 _cupsGetPassword
+_cupsGetPassword2
 _cupsGetPPD
 _cupsGetPPD2
 _cupsGetPPD3
@@ -169,6 +181,7 @@ _cupsPutFile
 _cupsReadResponseData
 _cupsRemoveDest
 _cupsRemoveOption
+_cupsResolveConflicts
 _cupsSendRequest
 _cupsServer
 _cupsSetDefaultDest
@@ -176,11 +189,14 @@ _cupsSetDests
 _cupsSetDests2
 _cupsSetEncryption
 _cupsSetPasswordCB
+_cupsSetPasswordCB2
 _cupsSetServer
 _cupsSetUser
 _cupsSideChannelDoRequest
 _cupsSideChannelRead
 _cupsSideChannelWrite
+_cupsSideChannelSNMPGet
+_cupsSideChannelSNMPWalk
 _cupsStartDocument
 _cupsTempFd
 _cupsTempFile
@@ -292,6 +308,8 @@ _ippRead
 _ippReadFile
 _ippReadIO
 _ippSetPort
+_ippTagString
+_ippTagValue
 _ippTimeToDate
 _ippWrite
 _ippWriteFile
@@ -316,9 +334,11 @@ _ppdFindNextAttr
 _ppdFindOption
 _ppdFirstCustomParam
 _ppdFirstOption
+_ppdInstallableConflict
 _ppdIsMarked
 _ppdLastError
 _ppdLocalize
+_ppdLocalizeAttr
 _ppdLocalizeIPPReason
 _ppdLocalizeMarkerName
 _ppdMarkDefaults
@@ -331,5 +351,6 @@ _ppdOpenFd
 _ppdOpenFile
 _ppdPageLength
 _ppdPageSize
+_ppdPageSizeLimits
 _ppdPageWidth
 _ppdSetConformance