eliminate duplicate macro definition and unnecessary -I

2026-05-01 22:57:33 +02:00 · 2012-03-20 14:17:37 -07:00 · 2012-03-20 14:17:37 -07:00 · 77fe7da636
commit 77fe7da636
parent 9eb4c95a8d
2 changed files with 3 additions and 1 deletions
--- a/src/libfwbuilder/qmake.inc.in
+++ b/src/libfwbuilder/qmake.inc.in
@ -65,7 +65,6 @@ win32 {
    CONFIG += staticlib

    DEFINES += LIBXML_STATIC LIBXSLT_STATIC 
-    INCLUDEPATH += ../../../fwb-lm/include
    INCLUDEPATH += c:/local/include c:/local/include/libxml2 c:/MinGW/include
    LIBS += -LC:\local\lib
 #    LIBS += ws2_32.lib pthreadVC.lib 
--- a/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h.in
+++ b/src/libfwbuilder/src/fwbuilder/libfwbuilder-config.h.in
@ -54,8 +54,11 @@
 */
 #undef HAVE_SNPRINT_OBJID

+#ifndef SNPRINTF
 #define SNPRINTF  snprintf
 #define VSNPRINTF vsnprintf
+#endif
+
 #define FS_SEPARATOR "/"