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:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1.2

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

    r98 r217  
    6868char *cgiUserAgent;
    6969char *cgiReferrer;
     70char *cgiSid;
    7071
    7172FILE *cgiIn;
     
    143144        cgiGetenv(&cgiScriptName, "SCRIPT_NAME");
    144145        cgiGetenv(&cgiQueryString, "QUERY_STRING");
     146        cgiSid=NULL;
    145147        if(strcmp(cgiQueryString,"")==0 && argc>=2){
    146148                cgiQueryString=argv[1];
     149                if(argc>2){
     150                  cgiSid=argv[2];
     151                }
    147152        }
    148153        cgiGetenv(&cgiRemoteHost, "REMOTE_HOST");
  • branches/branch-1.2/thirds/cgic206/cgic.h

    r98 r217  
    124124#endif
    125125char *cgiCookie;
     126
     127extern
     128#ifdef __cplusplus
     129"C"
     130#endif
     131char *cgiSid;
    126132
    127133/* A macro providing the same incorrect spelling that is
  • branches/branch-1.2/thirds/cgic206/makefile.vc

    r1 r217  
    99        -I $(GEODIR)/include
    1010
    11 all: libcgic.lib cgictest.exe capture.exe
     11all: libcgic.lib #cgictest.exe capture.exe
    1212
    1313install: libcgic.lib
     
    2424
    2525cgictest.exe: cgictest.obj
    26         link cgictest.obj $(LIBS1) /out:cgictest.exe
     26        link cgictest.obj $(LIBS) /out:cgictest.exe
    2727
    2828cgic.obj:
     
    3030
    3131capture.exe: capture.obj libcgic.lib
    32         $(CC) $(CFLAGS) capture.c $(LIBS1)
     32        $(CC) $(CFLAGS) capture.c $(LIBS)
    3333
    3434clean:
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