Changeset 4eb5b5 in git

Timestamp:

Jul 25, 2003, 4:04:09 PM (21 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

d57d382a91c9b38ddb47e8eaaf601a6507737461

Parents:

38c7697fd908b136212c41b99e9311214879a4b7

Message:

*levandov: hannes solution for static-dynamic problems


git-svn-id: file:///usr/local/Singular/svn/trunk@6849 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• ipid.cc (modified) (4 diffs)
• iplib.cc (modified) (4 diffs)

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.67 2003-05-22 17:55:27 Singular Exp $ */
+/* $Id: ipid.cc,v 1.68 2003-07-25 14:04:09 levandov Exp $ */
 
 /*
@@ -11 +11 @@
 
 #include "mod2.h"
+#include "static.h"
 #include "omalloc.h"
 #include "tok.h"
@@ -862 +863 @@
   if (pack->ref < 0)
   {
+#ifndef HAVE_STATIC
     if( pack->language == LANG_C)
     {
@@ -869 +871 @@
 #endif /* HAVE_DYNAMIC_LOADING */
     }
+#endif /* HAVE_STATIC */
     omfree((ADDRESS)pack->libname);
     memset((void *) pack, 0, sizeof(sip_package));

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.102 2002-12-19 11:22:52 Singular Exp $ */
+/* $Id: iplib.cc,v 1.103 2003-07-25 14:04:08 levandov Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -14 +14 @@
 
 #include "mod2.h"
+#include "static.h"
 #include "tok.h"
 #include "ipid.h"
@@ -1021 +1022 @@
 BOOLEAN load_modules(char *newlib, char *fullname, BOOLEAN tellerror)
 {
+#ifdef HAVE_STATIC
+  WerrorS("mod_init: static version can not load modules");
+  return TRUE;
+#else
   int iiAddCproc(char *libname, char *procname, BOOLEAN pstatic,
                  BOOLEAN(*func)(leftv res, leftv v));
@@ -1086 +1091 @@
   load_modules_end:
   return RET;
+#endif /*STATIC */  
 }
 #endif /* HAVE_DYNAMIC_LOADING */