Ignore:
Timestamp:
May 31, 2011, 3:30:49 AM (13 years ago)
Author:
djay
Message:

Merge trunk r111:r216 into branch-1.2

Location:
branches/branch-1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.2

  • branches/branch-1.2/zoo-kernel/service_conf.y

    r104 r217  
    3636static int previous_data=0;
    3737static int current_data=0;
    38 static char* myFinalObjectAsJSON="{";
    3938// namespace
    4039using namespace std;
     
    4241
    4342// srerror
    44 void srerror(char *s);
     43void srerror(const char *s);
    4544//======================================================
    4645
     
    713712/* fonction qui affiche l erreur si il y en a une */
    714713//======================================================
    715 void srerror(char *s)
     714void srerror(const char *s)
    716715{
    717716  if(debug)
     
    724723 * definition file.
    725724 */
    726 int getServiceFromFile(char* file,service** service){
     725int getServiceFromFile(const char* file,service** service){
    727726
    728727  freeMap(&previous_content);
     
    802801  *service=my_service;
    803802
     803#ifndef WIN32
    804804  srlex_destroy();
     805#endif
    805806  return resultatYYParse;
    806807}
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png