Changeset 5ae6c5 in git

Timestamp:

Aug 11, 2015, 12:10:26 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

7507543ae55ceb8b299a44ac7f671d67fa837d45

Parents:

a33cd1b6b0f7fb3d0afe76132b9095aed435f63dfbb4e432d27c526b5c80edab32e5394541f22821

Message:

Merge pull request #722 from doughdemon/spielwiese

Compile on Linux with musl libc

Files:

• Singular/LIB/dmodloc.lib (modified) (2 diffs)
• Singular/dyn_modules/singmathic/singmathic.cc (modified) (1 diff)
• Singular/feOptTab.h (modified) (1 diff)
• Tst/Plural/derham.res.gz.uu (modified) (1 diff)
• doc/Singular.man (modified) (1 diff)
• omalloc/omAllocFunc.h (modified) (1 diff)
• omalloc/omalloc.c (modified) (1 diff)

Singular/LIB/dmodloc.lib

@@ -64 +64 @@
 
 dmodGeneralAssumptionCheck();   check general assumptions
-safeVarName(s);    finds a free name to use for a new variable
 extendWeyl(S);     extends basering (Weyl algebra) by given vars
 polyVars(f,v);     checks whether f contains only variables indexed by v
@@ -188 +187 @@
 
 
-proc safeVarName (string s)
+static proc safeVarName (string s)
 "
 USAGE:    safeVarName(s);  s string

Singular/dyn_modules/singmathic/singmathic.cc

@@ -525 +525 @@
 extern "C" int SI_MOD_INIT(singmathic)(SModulFunctions* psModulFunctions)
 {
-  PrintS("Initializing Singular-Mathic interface Singmathic.\n");
   psModulFunctions->iiAddCproc(
     (currPack->libname ? currPack->libname : ""),

Singular/feOptTab.h

@@ -108 +108 @@
 
   {"allow-net",         no_argument,        LONG_OPTION_RETURN,
-   0,          "Allow to fetch (html) help pages from the net",                feOptBool,    0,      0},
+   0,          "Allow one to fetch (html) help pages from the net",    feOptBool,    0,      0},
 
   {"browser",           required_argument,  LONG_OPTION_RETURN,

Tst/Plural/derham.res.gz.uu

@@ -1 +1 @@
 begin 640 derham.res.gz
-M'XL("(/O0%4``V1E<FAA;2YR97,`I=?=;MHP%`#@^SR%A781(-#XWRD":>MZ
-M48E5TSI5D]#4IDIHHU%2)51+>/HE#;%-FJ:IQPWFV([QIW.PN?KY]>(2```7
-M8'GQ!0QVZ6ZZB>X&,U"T;J)MM+.'A_;]-DY">W!R`D8CL(G](`S`H+7S!D0I
-MV,8@W?G;P$\"<.>G45J,M<H'@L4"!&'RX#].M^'?:3%H9Q7SU&-.P=$:[9WM
-M:UA7A_V@PWZ"\$>YT,N6K&IF$@;ANO@BVWMPF_KK\-I/+OW'\+;HD]/Q`L@V
-MF19+3GJ^Y"Q:SCK_]?G;]^4Y@#+,C![&IR`IOV\R=QT[<_*A$SS-9*]8@*=X
-MDX/U/$>3#$]0-L:JUUN`393NP')>69S%#_%CO(GO<WL]E,.@6X#-K!7\?6J5
-MZ6"MD&SAJH7DV")9_D2;#4B<<DX=1<H,8I-M0J*;J>6HT<-8EQGD#;-,=8E^
-M8%Y_,.2V@2&HP!`RV2/".AB68:.,1;0+#+&#RMF\?+,S-('%J#$<CG(G']DY
-M&J/RDP)"_&W',VV8>,/1E8Y%BU0M8JUH':OG>VVVV%6V&)IP8*3;$ADVRFQ,
-M&K;._D@7TX;NR,XF<%B.&]G[LK6O(LH-LUZ\F'^`U]5X5ZQJ86O%&^18M))[
-MBIRX)DH$ZN14AHUJ@^!N<D*:Y&4>[Y4<H1W`SN`Z2,*7(ZT>SM[]/5#04$++
-MDX'P-E0B-%3/Q(&Z.BJ38:.BH.@5JO-\Q$IQ@_4P1@T@O?*6TO_,6U?+VY5H
-M8%/6ADVYPJ;"R,?3L7D=9D;EP&!W!C,DS[`,CW,\WJM3G^%>AQ@C/0ZQ6ED>
-M9XRVZ3&F]!@WVK#0]80,&^4]=[OU.%1Z:%P<7WND^E"'WNO2Y_@#I2]_13EI
-M4^14*7*CRR+GNJ(GPT8)S;WW"EZXS8M!A:G7O("]:EZ@#]0\;*WY^DFXS580
-M92N*VXYL&SF+(V>HUC:"%J^ACYB]!G-Y1<A?K@CHZ%K@]:/VWJ+N/JWD)KU6
-<8$\#]@K@\E];^??N.;7A</;)^@?Q'F.9;0X`````
+M'XL("`)WP%4``V1E<FAA;2YR97,`I==;;]HP%`#@]_P*"^TA0*#QW6X%TM;U
+MH1*;IG6:)J&IH@IMHZ6D2JB6\.L7%V*;-$U3CY<>CB^I/XZQN?KQ^?(K``#.
+MP>+R$QAL\^TTB6\&9Z"*KN--O/6'A_ANDV9K?W!R`D8CD*2K:!V!06OC-8AS
+ML$E!OEUMHE46@9M5'N=57T]-".9S$*VS^]7#=+/^.ZTZ;;UJG)GF%!P]H[VQ
+M_1G>U6$]Z+">:/U=/>AY2;H1SX&.R;2:<-+SI4=1->KBU\<OWQ87`.HT<YJ,
+M3T$6;^Y`-@L#OPC*81`]FG]6S,%CFI3@=E:B28$GJ!ACTRKG((GS+5C,]BL]
+M3^_3AS1)[TK_=JB[P;#B./.6\/>IISYL;XETA/<1TGVK4O@3)PG(`C6FSB)C
+M!K'+,B&QS<SCJ--DK,L,\H9989I$/S#9'PR%;6`(&C"$7-:(L`V&==JI8A'M
+M`D/LH'(^4W_\`DU@U6L,AZ,R*$=^B<9(O3-`B+_N>&YU$Z\XAMJQBL@^(MZ2
+MUKEZO&RSQ:&QQ="%`R/;ENBT4V5CTK`-=D>ZF#9T1WXQ@4/5;^3O5+3;9XP;
+M9KUX,7\';VCQ+MD^PMZ2-\BQ:"67AIR$+DH$VN14IYWV!L'=Y(0TR54=[XP<
+MH1W`P>!GE*V?#ZRZ.WOS^\!`0PVM3P;"VU")L%"EBP,-;52FTTZ;@J(7J,'3
+M$2O%#=9#'].!]*I;2O^S;D.K;I>B@4U9&S;E!IL*)Q]I8_,ZS9RV`X/=%<R0
+M/L,*/"[Q>&=.?89['6*,]#C$:F5]G#':IL>8T6/<:<'"UA,Z[53W/.S6X]#H
+MH7%U?.V0:4,=>B^W/L?OV/KZ6Y23-D5.C2)WNBQR;BM*G78J:"[?VO`B;%X,
+M]ICVGA>PUYX7Z!U['K;N^7HFW&8KB+$5U6U'QT[.XL@9FF<[08N7T$?,LL&L
+MK@CE\Q4!'5T+9#]J^1IU]VFE%RE;@:4%+"M@]9M,_7A[RGTX//O@_0-O58,G
+$2PX`````
 `
 end

doc/Singular.man

@@ -48 +48 @@
 .TP
 \fB\-\-allow\-net\fR
-Allow to fetch (html) help pages from the net
+Allow one to fetch (html) help pages from the net
 .TP
 \fB\-\-browser\fR=\fIBROWSER\fR

omalloc/omAllocFunc.h

@@ -12 +12 @@
 void omFreeFunc(void* addr);
 void* omVallocFunc(size_t size);
-#if defined(sgi)
 void* omMemalignFunc(size_t size_1, size_t size_2);
-#else
-#if (defined(__sun) && (defined(__sparc) || defined(__i386) || defined(__x86_64)) || defined(__CYGWIN__))
-extern void* omMemalignFunc(size_t, size_t);
-#else
-void* omMemalignFunc(void* alignment, size_t size);
-#endif
-#endif
 void* omReallocFunc(void* old_addr, size_t new_size);
 char* omStrdupFunc(const char* addr);

omalloc/omalloc.c

@@ -47 +47 @@
 }
 
-#if defined(sgi)
 void* memalign(size_t size_1, size_t size_2)
-#elif (defined(__sun) && (defined(__sparc) || defined(__i386) || defined(__x86_64)) || defined(__CYGWIN__))
-void* memalign(size_t size_1, size_t size_2)
-#else
-void* memalign(void* alignment, size_t size)
-#endif
 {
   fprintf(stderr, "omalloc Warning: memalign not yet implemented\n");