From 78f7e5da35751c2ce43bf45588b2c8998e0d11fe Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Thu, 29 Jul 2010 22:34:06 +0000
Subject: 	* clef/Makefile.in: Build and link programs by a C++ compiler.
 	* clef/edible.c: Make it acceptable to a C++ compiler. 	*
 driver/utils.c: Likewise. 	* sman/sman.c: Likewise.

---
 src/clef/Makefile.in | 6 +++---
 src/clef/edible.c    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/clef')

diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in
index 764df763..a442fd10 100644
--- a/src/clef/Makefile.in
+++ b/src/clef/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2010, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@ stamp: $(axiom_target_bindir)/clef$(EXEEXT)
 	$(STAMP) stamp
 
 $(axiom_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
-	$(LINK) -o $@ $(clef_objects) $(clef_LDADD) ${LDF}
+	$(CXXLINK) -o $@ $(clef_objects) $(clef_LDADD) ${LDF}
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .h
@@ -68,7 +68,7 @@ $(axiom_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
 	$(axiom_configdir)/openaxiom-c-macros.h
 
 %.lo: %.c $(axiom_c_macros_h)
-	$(COMPILE) -o $@ ${CCF} $(axiom_includes) $<
+	$(CXXCOMPILE) -o $@ ${CCF} $(axiom_includes) $<
 
 mostlyclean-local:
 	@rm -f $(clef_objects)
diff --git a/src/clef/edible.c b/src/clef/edible.c
index baacf5fa..100f5a43 100644
--- a/src/clef/edible.c
+++ b/src/clef/edible.c
@@ -1,7 +1,7 @@
 /*
     Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
     All rights reserved.
-    Copyright (C) 2007-2009, Gabriel Dos Reis.
+    Copyright (C) 2007-2010, Gabriel Dos Reis.
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -135,7 +135,7 @@ main(int argc, char *argv[])
   
   
 
-  putenv("LC_ALL=C");
+  putenv((char*) "LC_ALL=C");
   setlocale(LC_ALL, "");
   /* try to get a pseudoterminal to play with */
   if (ptyopen(&contNum, &serverNum, serverPath) == -1) {
@@ -280,11 +280,11 @@ main(int argc, char *argv[])
     }
 #endif
     
-    code = select(FD_SETSIZE,(void *) &rfds, NULL, NULL, NULL);
+    code = select(FD_SETSIZE, &rfds, NULL, NULL, NULL);
     for(; code < 0 ;) {
       if(errno == EINTR) {
         check_flip();
-        code = select(FD_SETSIZE,(void *) &rfds, NULL, NULL, NULL);
+        code = select(FD_SETSIZE, &rfds, NULL, NULL, NULL);
       }
       else  {
         perror("clef select failure");
-- 
cgit v1.2.3