Attachment #159215 for bug #230439

Lines 39-45 Link Here

(-)include/Lcommandline.h.orig (-1 / +1 lines)
39		39
40	#include "Lcommandline_globals.h" //command line global variables	40	#include "Lcommandline_globals.h" //command line global variables
41	#ifdef INCLUDE_PARI	41	#ifdef INCLUDE_PARI
42	#include "pari.h" //for pari's elliptic curve functions	42	#include "pari/pari.h" //for pari's elliptic curve functions
43	#undef init //pari has a '#define init pari_init' which	43	#undef init //pari has a '#define init pari_init' which
44	//causes trouble with the stream.h init.	44	//causes trouble with the stream.h init.
45	//pari also causes trouble with things like abs.	45	//pari also causes trouble with things like abs.

Lines 32-38 Link Here

(-)include/Lcommandline_elliptic.h.orig (-1 / +1 lines)
32		32
33		33
34	#ifdef INCLUDE_PARI	34	#ifdef INCLUDE_PARI
35	#include "pari.h" //for pari's elliptic curve functions	35	#include "pari/pari.h" //for pari's elliptic curve functions
36	#undef init //pari has a '#define init pari_init' which	36	#undef init //pari has a '#define init pari_init' which
37	//causes trouble with the stream.h init.	37	//causes trouble with the stream.h init.
38	//pari also causes trouble with things like abs.	38	//pari also causes trouble with things like abs.

Lines 61-67 Link Here

(-)src/Makefile.orig (-1 / +1 lines)
61		61
62	ifeq ($(PARI_DEFINE),-DINCLUDE_PARI)	62	ifeq ($(PARI_DEFINE),-DINCLUDE_PARI)
63	#location of pari.h.	63	#location of pari.h.
64	LOCATION_PARI_H = /usr/local/include/pari #usual location	64	LOCATION_PARI_H = /usr/local/include #usual location
65		65
66	#location of libpari.a or of libpari.so	66	#location of libpari.a or of libpari.so
67	#depending on whether static or dynamic libraries are being used.	67	#depending on whether static or dynamic libraries are being used.

Return to bug 230439