Changeset 217 for branches/branch-1.2/thirds

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)
• thirds/cgic206/cgic.c (modified) (2 diffs)
• thirds/cgic206/cgic.h (modified) (1 diff)
• thirds/cgic206/makefile.vc (modified) (3 diffs)

branches/branch-1.2/thirds/cgic206/cgic.c

@@ -68 +68 @@
 char *cgiUserAgent;
 char *cgiReferrer;
+char *cgiSid;
 
 FILE *cgiIn;
@@ -143 +144 @@
         cgiGetenv(&cgiScriptName, "SCRIPT_NAME");
         cgiGetenv(&cgiQueryString, "QUERY_STRING");
+        cgiSid=NULL;
         if(strcmp(cgiQueryString,"")==0 && argc>=2){
                 cgiQueryString=argv[1];
+                if(argc>2){
+                  cgiSid=argv[2];
+                }
         }
         cgiGetenv(&cgiRemoteHost, "REMOTE_HOST");

branches/branch-1.2/thirds/cgic206/cgic.h

@@ -124 +124 @@
 #endif
 char *cgiCookie;
+
+extern 
+#ifdef __cplusplus
+"C" 
+#endif
+char *cgiSid;
 
 /* A macro providing the same incorrect spelling that is

branches/branch-1.2/thirds/cgic206/makefile.vc

@@ -9 +9 @@
         -I $(GEODIR)/include 
 
-all: libcgic.lib cgictest.exe capture.exe
+all: libcgic.lib #cgictest.exe capture.exe 
 
 install: libcgic.lib
@@ -24 +24 @@
 
 cgictest.exe: cgictest.obj 
-        link cgictest.obj $(LIBS1) /out:cgictest.exe
+        link cgictest.obj $(LIBS) /out:cgictest.exe
 
 cgic.obj: 
@@ -30 +30 @@
 
 capture.exe: capture.obj libcgic.lib
-        $(CC) $(CFLAGS) capture.c $(LIBS1)
+        $(CC) $(CFLAGS) capture.c $(LIBS)
 
 clean: