Fixed compilation issue.

Conflicts:
	projects/stargazer/build

diff --git a/projects/stargazer/build b/projects/stargazer/build
index 686d781fa6fde82a2012dafacb710f18881973ff..6d2aea891c8c8e3606c837857eaf1ffd7384c1d3 100755 (executable)
--- a/projects/stargazer/build
+++ b/projects/stargazer/build
@@ -342,7 +342,7 @@ else
     fi
 fi
 
     fi
 fi
 

-printf "Checking for -lnfnetlink "
+printf "Checking for -lnfnetlink... "

 $CC $CFLAGS $LDFLAGS build_check.c -lnfnetlink -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
 $CC $CFLAGS $LDFLAGS build_check.c -lnfnetlink -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then


@@ -354,7 +354,7 @@ else
 fi
 rm -f fake
 
 fi
 rm -f fake
 

-printf "Checking for -lnetfilter_queue "
+printf "Checking for -lnetfilter_queue... "

 $CC $CFLAGS $LDFLAGS build_check.c -lnetfilter_queue -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then
 $CC $CFLAGS $LDFLAGS build_check.c -lnetfilter_queue -o fake > /dev/null 2> /dev/null
 if [ $? != 0 ]
 then

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
index ab78f00fee74a2e1d6e2d8c681a24a38e5bf4272..d4fdd3902cf96393ac951a6a6b83c771eeab7db3 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
@@ -288,13 +288,14 @@ if (tuples != 1)
     return -1;
     }
 
     return -1;
     }
 

+int32_t id;
+

     {
     std::stringstream tuple;
     tuple << PQgetvalue(result, 0, 0);
 
     PQclear(result);
 
     {
     std::stringstream tuple;
     tuple << PQgetvalue(result, 0, 0);
 
     PQclear(result);
 

-    int32_t id;

     tuple >> id;
     }
 
     tuple >> id;
     }