[Navit-cvs-commit] SF.net SVN: navit:[3578] trunk/navit/navit/search.h

[<aka...@us...>]

Revision: 3578
          http://navit.svn.sourceforge.net/navit/?rev=3578&view=rev
Author:   akashihi
Date:     2010-09-17 14:04:33 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
Fix:core:Made search.h c++ friendly

Modified Paths:
--------------
    trunk/navit/navit/search.h

Modified: trunk/navit/navit/search.h
===================================================================
--- trunk/navit/navit/search.h	2010-09-15 13:58:56 UTC (rev 3577)
+++ trunk/navit/navit/search.h	2010-09-17 14:04:33 UTC (rev 3578)
@@ -76,8 +76,8 @@
 struct search_list_result;
 struct search_list *search_list_new(struct mapset *ms);
 void search_list_search(struct search_list *this_, struct attr *search_attr, int partial);
-char *search_postal_merge(char *mask, char *new);
-char *search_postal_merge_replace(char *mask, char *new);
+char *search_postal_merge(char *mask, char *new_);
+char *search_postal_merge_replace(char *mask, char *new_);
 struct search_list_common *search_list_select(struct search_list *this_, enum attr_type attr_type, int id, int mode);
 struct search_list_result *search_list_get_result(struct search_list *this_);
 void search_list_destroy(struct search_list *this_);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.