Port htadd to win32

3 files changed, 35 insertions, 35 deletions

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 3ac1a3f1..233bf6cf 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -36,8 +36,6 @@ core_SOURCES = bsdsignal.c cfuns-c.c sockio-c.c
 terminal_io_SOURCES = cursor.c edin.c fnct_key.c openpty.c prt.c wct.c
 
 graphics_SOURCES = \
-		halloc.c \
-		hash.c \
 		pixmap.c \
 		spadcolors.c \
 		util.c \
@@ -47,7 +45,8 @@ graphics_SOURCES = \
 
 libspad_SOURCES = $(foreach comp, \
 			 $(addsuffix _SOURCES, @axiom_c_runtime@), \
-			 $($(comp)))
+			 $($(comp))) \
+		halloc.c hash.c 
 
 unused_SOURCES = emupty.c
 
@@ -81,16 +80,16 @@ $(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \
 		@axiom_c_runtime_extra@ -lm
 
 libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_SOURCES:.c=.lo)
-	$(LIBTOOL) --mode=link $(CC) -o $@ \
+	$(LIBTOOL) --mode=link $(CC) -static -o $@ \
 		$(libopen_axiom_core_SOURCES:.c=.lo)
 
 libspad.$(LIBEXT): $(libspad_objects)
-	$(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_objects)
+	$(LIBTOOL) --mode=link $(CC) -static -o $@ $(libspad_objects)
 
 .PRECIOUS: %.$(OBJEXT)
 
 %.$(OBJEXT) %.lo: %.c $(axiom_c_macros_h)
-	$(COMPILE) $(oa_shrobj_flags) -o $@ $(CCF) -DOPENAXIOM_BUILD_DLL \
+	$(COMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CCF) \
 		$(axiom_includes) $(AXIOM_X11_CFLAGS) $<
 
 # This is a support library, so it does not change often and
diff --git a/src/lib/cfuns-c.c b/src/lib/cfuns-c.c
index 2620be00..fe5380e8 100644
--- a/src/lib/cfuns-c.c
+++ b/src/lib/cfuns-c.c
@@ -540,3 +540,33 @@ oa_get_tmpdir(void)
    return "/tmp";
 #endif   
 }
+
+
+
+OPENAXIOM_EXPORT double 
+plus_infinity(void )
+{
+#ifdef INFINITY   
+   return INFINITY;
+#else
+   /* This must be a curious platform.  */
+   volatile double zero = 0.0;
+   return 1.0 / zero;           /* If it traps, well, it traps.  */
+#endif   
+}
+
+OPENAXIOM_EXPORT double 
+minus_infinity(void)
+{
+   return -plus_infinity();
+}
+
+OPENAXIOM_EXPORT double 
+NANQ(void)
+{
+#ifdef NAN
+   return NAN;
+#else
+   return sqrt(-1.0);            /* Juts pick one.  */
+#endif
+}
diff --git a/src/lib/sockio-c.c b/src/lib/sockio-c.c
index baab6445..d1df2bea 100644
--- a/src/lib/sockio-c.c
+++ b/src/lib/sockio-c.c
@@ -1174,32 +1174,3 @@ print_line(const char* s)
 {
   printf("%s\n", s);
 }
-
-
-OPENAXIOM_EXPORT double 
-plus_infinity(void )
-{
-#ifdef INFINITY   
-   return INFINITY;
-#else
-   /* This must be a curious platform.  */
-   volatile double zero = 0.0;
-   return 1.0 / zero;           /* If it traps, well, it traps.  */
-#endif   
-}
-
-OPENAXIOM_EXPORT double 
-minus_infinity(void)
-{
-   return -plus_infinity();
-}
-
-OPENAXIOM_EXPORT double 
-NANQ(void)
-{
-#ifdef NAN
-   return NAN;
-#else
-   return sqrt(-1.0);            /* Juts pick one.  */
-#endif
-}