Changeset 016648 in git

Timestamp:

Nov 25, 2011, 2:36:47 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')

Children:

802b082a764f90d5988c4a3e70a438f757e3e775

Parents:

b565d4f69d962cf1746a77db46934de7cc17f5e4

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-11-25 14:36:47+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-01-18 16:15:04+01:00

Message:

port: solaris does not like local structs

File:

• Singular/iplib.cc (modified) (3 diffs)

Singular/iplib.cc

@@ -293 +293 @@
   return NULL;
 }
+#ifndef LIBSINGULAR
+// see below:
+struct soptionStruct
+{
+  const char * name;
+  unsigned   setval;
+  unsigned   resetval;
+};
+extern struct soptionStruct optionStruct[];
+extern struct soptionStruct verboseStruct[];
+#endif
 
 BOOLEAN iiAllStart(procinfov pi, char *p,feBufferTypes t, int l)
@@ -309 +320 @@
   }
   #ifndef LIBSINGULAR
-  // the access to optionStruct and verboseStruct do not work 
+  // the access to optionStruct and verboseStruct do not work
   // on x86_64-Linux for pic-code
   int save11= ( si_opt_1 & ~TEST_RINGDEP_OPTS);
@@ -317 +328 @@
   (pi->libname!=NULL) && (pi->libname[0]!='\0'))
   {
-    struct soptionStruct
-    {
-      const char * name;
-      unsigned   setval;
-      unsigned   resetval;
-    };
-    extern struct soptionStruct optionStruct[];
-    extern struct soptionStruct verboseStruct[];
     Warn("option changed in proc %s from %s",pi->procname,pi->libname);
     int i;