Merge changes from CUPS 1.5svn-r9105.

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

diff --git a/cups/libcups_s.exp b/cups/libcups_s.exp
index 9872350936bebfd317cae5907138f4bda84247ef..35037ea5b0c4fcfbe9cfdbebf28588db5e6c4ab7 100644 (file)
--- a/cups/libcups_s.exp
+++ b/cups/libcups_s.exp
@@ -1,9 +1,9 @@
-_cupsAdminGetServerSettings
-_cupsAdminSetServerSettings
+_cups_debug_fd
 _cupsCharmapFlush
 _cupsCharmapFree
 _cupsCharmapGet
 _cupsEncodingName
+_cupsGet1284Values
 _cupsGetPassword
 _cupsGlobals
 _cupsLangPrintf
@@ -22,15 +22,18 @@ _cupsSNMPCopyOID
 _cupsSNMPDefaultCommunity
 _cupsSNMPIsOID
 _cupsSNMPIsOIDPrefixed
+_cupsSNMPOIDToString
 _cupsSNMPOpen
 _cupsSNMPRead
 _cupsSNMPSetDebug
+_cupsSNMPStringToOID
 _cupsSNMPWalk
 _cupsSNMPWrite
 _cupsStrAlloc
 _cupsStrFlush
 _cupsStrFormatd
 _cupsStrFree
+_cupsStrRetain
 _cupsStrScand
 _cupsStrStatistics
 _cups_getifaddrs
@@ -38,15 +41,38 @@ _cups_freeifaddrs
 _cups_strcpy
 _cups_strlcat
 _cups_strlcpy
+_httpAddrPort
 _httpBIOMethods
+_httpCreate
 _httpEncodeURI
+_httpPeek
 _httpResolveURI
+_httpWait
 _ippAddAttr
 _ippFreeAttr
 _ppdFreeLanguages
-_ppdGet1284Values
 _ppdGetEncoding
 _ppdGetLanguages
 _ppdHashName
 _ppdLocalizedAttr
 _ppdNormalizeMakeAndModel
+_ppdParseOptions
+_pwgCreateWithFile
+_pwgDestroy
+_pwgWriteFile
+_pwgGenerateSize
+_pwgInitSize
+_pwgMediaForLegacy
+_pwgMediaForPPD
+_pwgMediaForPWG
+_pwgMediaForSize
+_pwgCreateWithPPD
+_pwgGetInputSlot
+_pwgGetMediaType
+_pwgGetPageSize
+_pwgGetSize
+_pwgGetSource
+_pwgGetType
+_pwgInputSlotForSource
+_pwgMediaTypeForType
+_pwgPageSizeForMedia