diff --git a/lib/vector/Vlib/graph.c b/lib/vector/Vlib/graph.c index f708e190747..9230443f084 100644 --- a/lib/vector/Vlib/graph.c +++ b/lib/vector/Vlib/graph.c @@ -226,7 +226,7 @@ int Vect_graph_shortest_path(dglGraph_s *graph, int from, int to, if (List != NULL) { for (i = 0; i < pSPReport->cArc; i++) { line = dglEdgeGet_Id(graph, pSPReport->pArc[i].pnEdge); - G_debug(2, "From %ld to %ld - cost %ld user %d distance %ld", + G_debug(2, "From %d to %d - cost %d user %d distance %d", pSPReport->pArc[i].nFrom, pSPReport->pArc[i].nTo, /* this is the cost from clip() */ dglEdgeGet_Cost(graph, pSPReport->pArc[i].pnEdge) / 1000, diff --git a/lib/vector/Vlib/net_analyze.c b/lib/vector/Vlib/net_analyze.c index 9ad477484e3..f538835e326 100644 --- a/lib/vector/Vlib/net_analyze.c +++ b/lib/vector/Vlib/net_analyze.c @@ -71,7 +71,7 @@ static int convert_dgl_shortest_path_result(struct Map_info *Map, for (i = 0; i < pSPReport->cArc; i++) { line = dglEdgeGet_Id(&(Map->dgraph.graph_s), pSPReport->pArc[i].pnEdge); G_debug( - 2, "From %ld to %ld - cost %ld user %d distance %ld", + 2, "From %d to %d - cost %d user %d distance %d", pSPReport->pArc[i].nFrom, pSPReport->pArc[i].nTo, dglEdgeGet_Cost(&(Map->dgraph.graph_s), pSPReport->pArc[i].pnEdge) / Map->dgraph.cost_multip, /* this is the cost from clip() */ @@ -121,7 +121,7 @@ static int ttb_convert_dgl_shortest_path_result(struct Map_info *Map, line_id *= -1; G_debug( - 2, "From %ld to %ld - cost %ld user %d distance %ld", + 2, "From %d to %d - cost %d user %d distance %d", pSPReport->pArc[i].nFrom, pSPReport->pArc[i].nTo, dglEdgeGet_Cost(&(Map->dgraph.graph_s), pSPReport->pArc[i].pnEdge) / Map->dgraph.cost_multip, /* this is the cost from clip() */ diff --git a/lib/vector/dglib/type.h b/lib/vector/dglib/type.h index 0374fb86799..27c5f745a99 100644 --- a/lib/vector/dglib/type.h +++ b/lib/vector/dglib/type.h @@ -20,8 +20,10 @@ #define G_NDR 1 #endif +#include + typedef unsigned char dglByte_t; -typedef long dglInt32_t; -typedef long long dglInt64_t; +typedef int32_t dglInt32_t; +typedef int64_t dglInt64_t; #endif