Merge pull request #28 from sasa-friedrich-bitlab/hotfix/IPP_accessor…

…_functions Removed support for _IPP_PRIVATE_STRUCTURES
m0wfo · Jan 25, 2021 · e5acf10 · e5acf10
2 parents fb78905 + 2a97267
commit e5acf10
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/ext/cups.c b/ext/cups.c
@@ -468,7 +468,7 @@ static VALUE cups_get_device_uri(VALUE self, VALUE printer)
  {
  if((attr = ippFindAttribute(response, "device-uri", IPP_TAG_URI)) != NULL)
  {
- return rb_str_new2(attr->values[0].string.text);
+ return rb_str_new2(ippGetString(attr, 0, NULL));
  }
  ippDelete(response);
  }

diff --git a/ext/ruby_cups.h b/ext/ruby_cups.h
@@ -1,6 +1,3 @@
-// Enable access to IPP private structures post Cups 1.5
-// (In Mac OS 10.8 thru 10.9 specifically enabled by Apple but not 10.10)
-#define _IPP_PRIVATE_STRUCTURES 1
 #include <cups/cups.h>
 
 // st.h is needed for ST_CONTINUE constant