Changeset 11553 for trunk/gsdl


Ignore:
Timestamp:
2006-03-31T16:10:20+12:00 (18 years ago)
Author:
kjdon
Message:

Latest compile complained about redefinition of funciton yaz_log, defined in a math header. Turns out that yaz log.h #defines logf to yaz_log.
So moved the yaz headers includes to come last in z3950parser.h, and removed them from z3950server.cpp cos that includes z3950parser.h

Location:
trunk/gsdl/src/colservr
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl/src/colservr/z3950parser.h

    r10436 r11553  
    2727#define Z3950PARSER_H
    2828
    29 // YAZ headers
    30 extern "C" {
    31 #include <yaz/backend.h>
    32 #include <yaz/log.h>
    33 #ifdef ASN_COMPILED
    34 #include <yaz/ill.h>
    35 #endif
    36 }
    3729
    3830#include <string>
    … …  
    5042#include "nullproto.h"
    5143#include "z3950_to_gsdl.h"
     44
     45// YAZ headers
     46extern "C" {
     47#include <yaz/backend.h>
     48#include <yaz/log.h>
     49#ifdef ASN_COMPILED
     50#include <yaz/ill.h>
     51#endif
     52}
    5253
    5354extern text_t gsdlhome;

  • trunk/gsdl/src/colservr/z3950server.cpp

    r10436 r11553  
    1 
    2 // YAZ headers
    3 #include <yaz/backend.h>
    4 #include <yaz/log.h>
    5 #ifdef ASN_COMPILED
    6 #include <yaz/ill.h>
    7 #endif
    81
    92
    … …  
    3730#include "recptproto.h"
    3831#include "nullproto.h"
    39 
    4032
    4133// Z39.50 server headers
Note: See TracChangeset for help on using the changeset viewer.