Changeset 217 for branches/branch-1.2/zoo-kernel/service_conf.y

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:

• . (modified) (1 prop)
• zoo-kernel/service_conf.y (modified) (5 diffs)

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

@@ -36 +36 @@
 static int previous_data=0;
 static int current_data=0;
-static char* myFinalObjectAsJSON="{";
 // namespace
 using namespace std;
@@ -42 +41 @@
 
 // srerror
-void srerror(char *s);
+void srerror(const char *s);
 //======================================================
 
@@ -713 +712 @@
 /* fonction qui affiche l erreur si il y en a une */
 //======================================================
-void srerror(char *s)
+void srerror(const char *s)
 {
   if(debug)
@@ -724 +723 @@
  * definition file.
  */
-int getServiceFromFile(char* file,service** service){
+int getServiceFromFile(const char* file,service** service){
 
   freeMap(&previous_content);
@@ -802 +801 @@
   *service=my_service;
 
+#ifndef WIN32
   srlex_destroy();
+#endif
   return resultatYYParse;
 }