فهرست منبع

Make libxcap compilable on FreeBSD, particularly:

o always include <time.h> before libxml's headers, since apparently they
  expect time_t to be defined;

o reorder includes, so that system ones are includes first;

o add appropriate -I/-L into Makefile (quick hack). It would be better if
  those libs were using main ser's Makefile* infrastructure, so that it's
  possible to re-use LOCALBASE.
Maxim Sobolev 20 سال پیش
والد
کامیت
01ded6a645
5فایلهای تغییر یافته به همراه13 افزوده شده و 8 حذف شده
  1. 2 2
      lib/xcap/Makefile
  2. 1 0
      lib/xcap/resource_list.c
  3. 4 3
      lib/xcap/resource_lists_parser.c
  4. 4 3
      lib/xcap/rls_services_parser.c
  5. 2 0
      lib/xcap/xml_utils.c

+ 2 - 2
lib/xcap/Makefile

@@ -1,6 +1,6 @@
 DEFS     += 
-INCLUDES += -I/usr/include/libxml2
-LIBS     += -lxml2 -lcurl
+INCLUDES += -I/usr/include/libxml2 -I/usr/local/include/libxml2 -I/usr/local/include
+LIBS     += -L/usr/local/lib -lxml2 -lcurl
 
 # name of result executable or library
 NAME = xcap

+ 1 - 0
lib/xcap/resource_list.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include <cds/dstring.h>
 #include <xcap/xcap_client.h>

+ 4 - 3
lib/xcap/resource_lists_parser.c

@@ -23,13 +23,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
 #include <xcap/resource_lists_parser.h>
 #include <xcap/xml_utils.h>
 #include <cds/logger.h>
 
-#include <stdio.h>
-#include <string.h>
-
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <cds/sstr.h>

+ 4 - 3
lib/xcap/rls_services_parser.c

@@ -23,11 +23,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <xcap/rls_services_parser.h>
-#include <xcap/xml_utils.h>
-
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
+
+#include <xcap/rls_services_parser.h>
+#include <xcap/xml_utils.h>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>

+ 2 - 0
lib/xcap/xml_utils.c

@@ -25,6 +25,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
+
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <cds/logger.h>