Changeset 933 for branches/prototype-v0/zoo-project/zoo-kernel/service_internal_mono.c

Timestamp:

May 31, 2019, 3:03:21 PM (5 years ago)

Author:

knut

Message:

Resolve certain string-related type conflicts, e.g., char* vs. const char* or char[N], that may cause errors in some build environments. Resolve a problem with the include order of fcgi_stdio.h (note: should verify that this harmonizes with resolution of same problem in trunk).

File:

• branches/prototype-v0/zoo-project/zoo-kernel/service_internal_mono.c (modified) (2 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/service_internal_mono.c

@@ -55 +55 @@
   MonoImage* monoImage;
 
-  char* libPath="/usr/lib";
-  char* etcPath="/etc";
+  static char LIB[] = "/usr/lib";
+  static char ETC[] = "/etc";
+ 
+  char* libPath = LIB;
+  char* etcPath = ETC;
   map* libPathMap=getMapFromMaps(*main_conf,"mono","lib");
   map* etcPathMap=getMapFromMaps(*main_conf,"mono","etc");
@@ -84 +87 @@
   //MonoDomain* monoDomain = mono_jit_init("ZOO_Embedded_Domain");  
 
-  char* ZMapsLib = "ZMaps.dll";
+  const char* ZMapsLib = "ZMaps.dll";
   char *zooAssembly = NULL;