Ignore:
Timestamp:
Jun 4, 2010, 3:11:43 PM (15 years ago)
Author:
Silvan Scherrer
Message:

Samba Server 3.5: merged changes from 3.3

Location:
trunk/server/source3/libaddns
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/server/source3/libaddns/dns.h

    r414 r454  
    4141#include <fcntl.h>
    4242#include <time.h>
     43#ifndef __OS2__
    4344#include <string.h>
     45#endif
    4446#include <errno.h>
    4547#include <netdb.h>

  • trunk/server/source3/libaddns/dnserr.h

    r414 r454  
    3636/* Setup the DNS_ERROR typedef.  Technique takes from nt_status.h */
    3737
    38 #if defined(HAVE_IMMEDIATE_STRUCTURES)
     38#if defined(HAVE_IMMEDIATE_STRUCTURES) && !defined(__OS2__)
    3939typedef struct {uint32 v;} DNS_ERROR;
    4040#define ERROR_DNS(x) ((DNS_ERROR) { x })
Note: See TracChangeset for help on using the changeset viewer.