Changeset 1663 in Sophya for trunk/ArchTOIPipe/Kernel

Timestamp:

Oct 1, 2001, 4:01:35 PM (24 years ago)

Author:

aubourg

Message:

darwin

Location:

trunk/ArchTOIPipe/Kernel

Files:

• Makefile.in (modified) (3 diffs)
• toiprocessor.cc (modified) (2 diffs)

trunk/ArchTOIPipe/Kernel/Makefile.in

@@ -40 +40 @@
  ifeq ($(CXX), cxx)
   CXXFLAGS := -O -g -D__USE_STD_IOSTREAM
+  LIBS := $(LIBS) -pthread
  endif
 endif
@@ -77 +78 @@
 libatkern.a: $(FILES)
         $(AR) -cr libatkern.a $(FILES)
+        ranlib libatkern.a
         ln -f libatkern.a ../libatkern.a
 
@@ -84 +86 @@
 
 %: %.o $(FILES)
-        $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -pthread -o $@ -lm
+        $(LINK.cc) $^ $(LOADLIBES) $(LDLIBS)  -o $@ -lm
 
 %.o:$(srcdir)/%.cc
-        $(COMPILE.cc) -pthread -o $@ $<
+        $(COMPILE.cc) -o $@ $<
 
 %.o:$(srcdir)/%.c
-        $(COMPILE.c) -pthread -o $@ $<
+        $(COMPILE.c)  -o $@ $<
 
 

trunk/ArchTOIPipe/Kernel/toiprocessor.cc

@@ -2 +2 @@
 #include "toimanager.h"
 #include <pthread.h>
+
+#ifdef HAVE_VALUES_H
 #include <values.h>
+#endif
+
+#ifndef MAXINT
+#define MAXINT 2147483647
+#endif
+
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
 #ifdef WITH_SOPHYA
@@ -88 +99 @@
 
 int TOIProcessor::getMaxIn() {
-  int nIn = inIx.size();
-  int maxIn = MAXINT;
+  int_4 nIn = inIx.size();
+  int_4 maxIn = MAXINT;
   for (int i=0; i<nIn; i++) {
     TOI* toi = inTOIs[i];
     if (toi == NULL) continue;  // Protection - Reza  13/3/2001
-    int x = toi->getMaxSn();
+    int_4 x = toi->getMaxSn();
     if (x < maxIn) maxIn = x;
   }