Revert "macos"

This reverts commit 7e396312aadd50b438ebfbd03e57fcb8640e87f4.

4 files changed, 11 insertions, 12 deletions

diff --git a/jam-files/engine/modules/path.c b/jam-files/engine/modules/path.c
index 38c1e563c..f8dedaccd 100644
--- a/jam-files/engine/modules/path.c
+++ b/jam-files/engine/modules/path.c
@@ -9,7 +9,6 @@
 #include "../lists.h"
 #include "../native.h"
 #include "../timestamp.h"
-#include "../filesys.h"
 
 
 LIST * path_exists( FRAME * frame, int flags )
diff --git a/phrase-extract/syntax-common/tree-inl.h b/phrase-extract/syntax-common/tree-inl.h
index 2dae0acb1..811bae2d2 100644
--- a/phrase-extract/syntax-common/tree-inl.h
+++ b/phrase-extract/syntax-common/tree-inl.h
@@ -73,7 +73,7 @@ Tree<T>::PreOrderIter<V>::PreOrderIter(V &t)
 
 template<typename T>
 template<typename V>
-typename Tree<T>::template PreOrderIter<V> &Tree<T>::PreOrderIter<V>::operator++() {
+Tree<T>::PreOrderIter<V> &Tree<T>::PreOrderIter<V>::operator++() {
   // If the current node has children then visit the left-most child next.
   if (!node_->children().empty()) {
     index_stack_.push(0);
@@ -100,7 +100,7 @@ typename Tree<T>::template PreOrderIter<V> &Tree<T>::PreOrderIter<V>::operator++
 
 template<typename T>
 template<typename V>
-typename Tree<T>::template PreOrderIter<V> Tree<T>::PreOrderIter<V>::operator++(int) {
+Tree<T>::PreOrderIter<V> Tree<T>::PreOrderIter<V>::operator++(int) {
   PreOrderIter tmp(*this);
   ++*this;
   return tmp;
@@ -162,7 +162,7 @@ Tree<T>::LeafIter<V>::LeafIter(V &t)
 
 template<typename T>
 template<typename V>
-typename Tree<T>::template LeafIter<V> &Tree<T>::LeafIter<V>::operator++() {
+Tree<T>::LeafIter<V> &Tree<T>::LeafIter<V>::operator++() {
   // Try node's ancestors until either a node is found with a sibling to the
   // right or we reach the root (in which case the traversal is complete).
   V *ancestor = node_->parent_;
@@ -187,7 +187,7 @@ typename Tree<T>::template LeafIter<V> &Tree<T>::LeafIter<V>::operator++() {
 
 template<typename T>
 template<typename V>
-typename Tree<T>::template LeafIter<V> Tree<T>::LeafIter<V>::operator++(int) {
+Tree<T>::LeafIter<V> Tree<T>::LeafIter<V>::operator++(int) {
   LeafIter tmp(*this);
   ++*this;
   return tmp;
diff --git a/symal/Jamfile b/symal/Jamfile
index 3163d1e53..3ab564790 100644
--- a/symal/Jamfile
+++ b/symal/Jamfile
@@ -1,2 +1,2 @@
-exe symal : symal.cpp cmd.cpp ;
+exe symal : symal.cpp cmd.c ;
 
diff --git a/symal/cmd.cpp b/symal/cmd.c
index 76c93f490..e1a667eb9 100644
--- a/symal/cmd.cpp
+++ b/symal/cmd.c
@@ -144,7 +144,7 @@ int DeclareParams(const char *ParName, ...)
       cmds[j].p = va_arg(args, void *);
       break;
     case CMDSUBRANGETYPE: {	/* get the two extremes		     */
-      int *subrange = (int*) calloc(2, sizeof(int));
+      int *subrange = calloc(2, sizeof(int));
       cmds[j].p = subrange;
       subrange[0] = va_arg(args, int);
       subrange[1] = va_arg(args, int);
@@ -152,7 +152,7 @@ int DeclareParams(const char *ParName, ...)
     break;
     case CMDGTETYPE:	/* get lower or upper bound	     */
     case CMDLTETYPE: {
-      int *value = (int*) calloc(1, sizeof(int));
+      int *value = calloc(1, sizeof(int));
       cmds[j].p = value;
       value[0] = va_arg(args, int);
     }
@@ -320,12 +320,12 @@ static char **str2array(const char *s, const char *sep)
     p += strspn(p, sep);
     ++n;
   }
-  a = (char **) calloc(n+1, sizeof(char *));
+  a = calloc(n+1, sizeof(char *));
   p = s;
   n = 0;
   while(*p) {
     l = strcspn(p, sep);
-    a[n] = (char *) malloc(l+1);
+    a[n] = malloc(l+1);
     memcpy(a[n], p, l);
     a[n][l] = 0;
     ++n;
@@ -479,7 +479,7 @@ static void PrintStrArray(const Cmd_T *cmd, int ValFlag, FILE *fp)
   int	l = 4+strlen(cmd->Name);
 
   fprintf(fp, "%s", cmd->Name);
-  indent = (char *) malloc(l+2);
+  indent = malloc(l+2);
   memset(indent, ' ', l+1);
   indent[l+1] = 0;
   if(ValFlag) {
@@ -578,7 +578,7 @@ int GetParams(int *n, char ***a, const char *CmdFileName)
 #define	PATHSEP '/'
 #endif
 
-  if(!(Line=(char *) malloc(LINSIZ))) {
+  if(!(Line=malloc(LINSIZ))) {
     fprintf(stderr, "GetParams(): Unable to alloc %d bytes\n",
             LINSIZ);
     exit(1);