Ignore:
Timestamp:
May 7, 2019, 2:17:08 PM (6 years ago)
Author:
djay
Message:

Merge prototype-v0 branch in trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/zoo-project/zoo-kernel/ulinet.h

    r889 r917  
    22 * Author : Gérald FENOY
    33 *
    4  *  Copyright 2008-2009 GeoLabs SARL. All rights reserved.
     4 *  Copyright 2008-2019 GeoLabs SARL. All rights reserved.
    55 *
    66 * Permission is hereby granted, free of charge, to any person obtaining a copy
     
    2626#define _ULINET_H
    2727
    28 #include "fcgi_stdio.h"
    2928#include <stdlib.h>
    3029#include <fcntl.h>
    3130#include <curl/curl.h>
     31#include <curl/curlver.h>
    3232#include "service.h"
    3333#ifndef WIN32
     
    4444#include "jsapi.h"
    4545#endif
    46 /* knut: see new definition of bool in service.h
    47 #ifndef bool
    48 #define bool int
     46#ifndef __cplusplus
     47// knut: see new def of bool in service.h
     48//#ifndef bool
     49//#define bool int
     50//#endif
     51//#ifndef true
     52//#define true 1
     53//#define false 0
     54//#endif
    4955#endif
    50 #ifndef true
    51 #define true 1
    52 #define false 0
    53 #endif
    54 */
    5556
    5657#define MAX_REQ 50
     
    102103  size_t write_data_into(void*,size_t,size_t,void*);
    103104
     105  size_t write_data_into_file(void*,size_t,size_t,void*);
     106
    104107  size_t header_write_data(void*,size_t,size_t,void*);
    105108
     
    130133  HINTERNET InternetOpen(char*,int,char*,char*,int);
    131134
     135  char* getProvenance(maps*,const char*);
    132136  int isProtectedHost(const char*,const char*);
    133137  int AddMissingHeaderEntry(_HINTERNET*,const char*,const char*);
     
    153157  typedef size_t* LPDWORD;
    154158#endif
    155 /* knut: see new definition of bool in service.h
    156 #ifndef bool
    157 #define bool int
    158 #endif
    159 */
     159// knut: see new definition of bool in service.h
     160//#ifndef bool
     161//#define bool int
     162//#endif
    160163
    161164#  define CHECK_INET_HANDLE(h) (h.handle != 0)
    162165
    163   HINTERNET InternetOpenUrl(HINTERNET*,LPCTSTR,LPCTSTR,size_t,size_t,size_t);
     166  HINTERNET InternetOpenUrl(HINTERNET*,LPCTSTR,LPCTSTR,size_t,size_t,size_t,const maps*);
    164167
    165168  int processDownloads(HINTERNET*);
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