From 696e04ba7d19fa1d370a8f4a6fc71f49345c3553 Mon Sep 17 00:00:00 2001
From: "N.N." <matju@users.sourceforge.net>
Date: Sun, 26 Apr 2009 03:57:57 +0000
Subject: refrain from using std::vector's data() for portability reasons (it's
 GNU-only)

svn path=/trunk/; revision=11152
---
 desiredata/src/s_path.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'desiredata/src/s_path.c')

diff --git a/desiredata/src/s_path.c b/desiredata/src/s_path.c
index 56c90c35..34925739 100644
--- a/desiredata/src/s_path.c
+++ b/desiredata/src/s_path.c
@@ -250,6 +250,15 @@ extern "C" int sys_argparse(int argc, char **argv);
 #define NUMARGS 1000
 #define foreach(ITER,COLL) for(typeof(COLL.begin()) ITER = COLL.begin(); ITER != (COLL).end(); ITER++)
 
+static int sys_argparse(std::vector<char *> args) {
+    size_t argc = args.size();
+    char **argv = (char **)malloc(argc*sizeof(char *));
+    for (size_t i=0; i<argc; i++) argv[i] = args[i];
+    int r = sys_argparse(argc,argv);
+    free(argv);
+    return r;
+}
+
 extern "C" int sys_parsercfile(char *filename) {
     std::vector<char*> argv;
     char buf[1000];
@@ -279,7 +288,8 @@ extern "C" int sys_parsercfile(char *filename) {
             foreach(a,argv) post("%s",*a);
         } else post("no RC file arguments found");
     }
-    if (sys_argparse(argv.size(),argv.data())) {
+//    if (sys_argparse(argv.size(),argv.data())) {
+    if (sys_argparse(argv)) {
         post("error parsing RC arguments");
 	goto cleanup;
     }
-- 
cgit v1.2.1