externalize usp define

frameworks/C++/ULib/install.sh

@@ -76,6 +76,7 @@ export CC CXX
 find . -exec touch {} \;
 
 USP_LIBS="-ljson" \
+USP_FLAGS="-DAS_cpoll_cppsp_DO" \
 ./configure --prefix=$ULIB_ROOT \
    --disable-static \
    --with-mysql --with-pgsql --with-sqlite3 \

frameworks/C++/ULib/src/db.usp

@@ -1,8 +1,6 @@
 <!--#declaration
 #include "world.h"
 
-#define AS_cpoll_cppsp_DO
-
 #ifndef AS_cpoll_cppsp_DO
 static UValue* pvalue;
 #endif

frameworks/C++/ULib/src/json.usp

@@ -1,6 +1,4 @@
 <!--#declaration
-#define AS_cpoll_cppsp_DO
-
 #ifdef AS_cpoll_cppsp_DO
 #  include <json/json.h>
 #else

frameworks/C++/ULib/src/query.usp

@@ -1,8 +1,6 @@
 <!--#declaration
 #include "world.h"
 
-#define AS_cpoll_cppsp_DO
-
 #ifndef AS_cpoll_cppsp_DO
 static UValue* pvalue;
 #endif

frameworks/C++/ULib/src/update.usp

@@ -1,8 +1,6 @@
 <!--#declaration
 #include "world.h"
 
-#define AS_cpoll_cppsp_DO
-
 #ifndef AS_cpoll_cppsp_DO
 static UValue* pvalue;
 #endif