Ticket #11230: 11230_pariout.patch

sage/libs/pari/decl.pxi

@@ -1569 +1569 @@
 include 'declinl.pxi'
 
 
+cdef extern from *:   # paristio.h
+    struct PariOUT:
+        void (*putch)(char)
+        void (*puts)(char*)
+        void (*flush)()
+    extern PariOUT* pariOut
+
+
 cdef extern from 'pari/paripriv.h':
-    struct __x:
+    struct pariout_t:
         char format  # e,f,g
         long fieldw  # 0 (ignored) or field width
         long sigd    # -1 (all) or number of significant digits printed */
         int sp       # 0 = suppress whitespace from output */
         int prettyp  # output style: raw, prettyprint, etc */
         int TeXstyle
-    ctypedef __x pariout_t
 
-    struct __z:
+    struct gp_data:
         jmp_buf env
         pariout_t *fmt
-    ctypedef __z gp_data
     extern gp_data* GP_DATA
-
-
-cdef extern:   # paristio.h
-    ctypedef struct PariOUT:
-        void (*putch)(char)
-        void (*puts)(char*)
-        void (*flush)()

sage/libs/pari/gen.pyx

@@ -8739 +8739 @@
 
 # Callbacks from PARI to print stuff using sys.stdout.write() instead
 # of C library functions like puts().
-cdef extern:
-    PariOUT defaultOut
-    PariOUT defaultErr
+cdef PariOUT sage_pariOut
 
 cdef void sage_putchar(char c):
     cdef char str[2]
@@ -8824 +8822 @@
         GP_DATA.fmt.sigd = prec_bits_to_dec(53)
 
         # Set printing functions
-        defaultOut.putch = sage_putchar
-        defaultOut.puts = sage_puts
-        defaultOut.flush = sage_flush
+        global pariOut
+        pariOut = &sage_pariOut
+        pariOut.putch = sage_putchar
+        pariOut.puts = sage_puts
+        pariOut.flush = sage_flush
 
         self.PARI_ZERO = self.new_gen_noclear(gen_0)
         self.PARI_ONE = self.new_gen_noclear(gen_1)