New path finder

[empserver] / src / lib / as / as_merge.c

diff --git a/src/lib/as/as_merge.c b/src/lib/as/as_merge.c
index 835495426b8ee42ec86ecb1a1579338a15652f79..ccd7b799a6be8b90984fe25e01862d8da93a4f12 100644 (file)
--- a/src/lib/as/as_merge.c
+++ b/src/lib/as/as_merge.c
@@ -17,14 +17,12 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-#include <stdio.h>
+
+#include <config.h>
+
 #include <stdlib.h>
 #include "as.h"
 
-#if !defined(lint) && !defined(SABER)
-static char sccsid[] = "@(#)as_merge.c 1.2     11/13/90";
-#endif /* not lint */
-
 /*
  * Merge neighbors into queue, keeping it sorted.  "neighbors" is sorted,
  * both by lower bound cost and then by secondary cost.
@@ -81,5 +79,5 @@ as_merge(struct as_data *adp, struct as_queue *head,
        np->step++;
     }
 
-    return (head);
+    return head;
 }