Changeset 354 for trunk/src/emx/include/netdb.h

Timestamp:

Jul 11, 2003, 1:39:47 PM (22 years ago)

Author:

bird

Message:

#434: no function redefinitions. TCPCALL not _System.

File:

• trunk/src/emx/include/netdb.h (modified) (3 diffs, 1 prop)

trunk/src/emx/include/netdb.h

@@ -34 +34 @@
  *
  *      from: @(#)netdb.h       5.15 (Berkeley) 4/3/91
- *      netdb.h,v 1.3 2003/05/19 13:20:02 bird Exp
+ *      netdb.h,v 1.4 2003/07/11 11:39:47 bird Exp
  */
 
@@ -165 +165 @@
 #endif
 
-#ifdef TCPV40HDRS
-/** @name tcpip40 function mappings.
- * @{ */
-#define gethostname         tcpip40_gethostname
-#define gethostbyname       tcpip40_gethostbyname
-#define gethostbyaddr       tcpip40_gethostbyaddr
-#define getnetbyname        tcpip40_getnetbyname
-#define getnetbyaddr        tcpip40_getnetbyaddr
-#define getservbyname       tcpip40_getservbyname
-#define getservbyport       tcpip40_getservbyport
-#define getservent          tcpip40_getservent
-#define getprotobyname      tcpip40_getprotobyname
-#define getprotobynumber    tcpip40_getprotobynumber
-#define sethostent          tcpip40_sethostent
-#define gethostent          tcpip40_gethostent
-#define endhostent          tcpip40_endhostent
-#define setnetent           tcpip40_setnetent
-#define getnetent           tcpip40_getnetent
-#define endnetent           tcpip40_endnetent
-#define setprotoent         tcpip40_setprotoent
-#define getprotoent         tcpip40_getprotoent
-#define endprotoent         tcpip40_endprotoent
-#define setservent          tcpip40_setservent
-#define getservent          tcpip40_getservent
-#define endservent          tcpip40_endservent
-#define tcp_h_errno         tcpip40_tcp_h_errno
-#define Rgethostbyname      tcpip40_Rgethostbyname
-/* @} */
-#endif
-
+#ifndef TCPCALL
+#define TCPCALL _System
+#endif
 
 /* BSD */
-int                 _System gethostname( char *, int );
-struct hostent *    _System gethostbyname( __const__ char * );
-struct hostent *    _System gethostbyaddr( __const__ char *, int, int );
-struct netent *     _System getnetbyname( __const__ char * );
-struct netent *     _System getnetbyaddr( unsigned long, int );
-struct servent *    _System getservbyname( __const__ char *, char * );
-struct servent *    _System getservbyport( int, __const__ char * );
-struct servent *    _System getservent( void );
-struct protoent *   _System getprotobyname( __const__ char * );
-struct protoent *   _System getprotobynumber( int );
-void                _System sethostent( int );
-struct hostent *    _System gethostent( void );
-void                _System endhostent(void);
-void                _System setnetent( int );
-struct netent *     _System getnetent( void );
-void                _System endnetent(void);
-void                _System setprotoent( int );
-struct protoent *   _System getprotoent( void );
-void                _System endprotoent(void);
-void                _System setservent( int );
-struct servent *    _System getservent( void );
-void                _System endservent(void);
+int                 TCPCALL gethostname( char *, int );
+struct hostent *    TCPCALL gethostbyname( __const__ char * );
+struct hostent *    TCPCALL gethostbyaddr( __const__ char *, int, int );
+struct netent *     TCPCALL getnetbyname( __const__ char * );
+struct netent *     TCPCALL getnetbyaddr( unsigned long, int );
+struct servent *    TCPCALL getservbyname( __const__ char *, char * );
+struct servent *    TCPCALL getservbyport( int, __const__ char * );
+struct servent *    TCPCALL getservent( void );
+struct protoent *   TCPCALL getprotobyname( __const__ char * );
+struct protoent *   TCPCALL getprotobynumber( int );
+void                TCPCALL sethostent( int );
+struct hostent *    TCPCALL gethostent( void );
+void                TCPCALL endhostent(void);
+void                TCPCALL setnetent( int );
+struct netent *     TCPCALL getnetent( void );
+void                TCPCALL endnetent(void);
+void                TCPCALL setprotoent( int );
+struct protoent *   TCPCALL getprotoent( void );
+void                TCPCALL endprotoent(void);
+void                TCPCALL setservent( int );
+struct servent *    TCPCALL getservent( void );
+void                TCPCALL endservent(void);
 #ifndef TCPV40HDRS
-struct hostent *    _System gethostbyname2( __const__ char *, int );
+struct hostent *    TCPCALL gethostbyname2( __const__ char *, int );
 #endif
 
@@ -226 +199 @@
 /* OS2 Additions */
 #ifdef TCPV40HDRS
-int                 _System tcp_h_errno(void);
-struct hostent *    _System Rgethostbyname(char *); /* Socks additions */
+int                 TCPCALL tcp_h_errno(void);
+struct hostent *    TCPCALL Rgethostbyname(char *); /* Socks additions */
 #else
-const char *        _System hstrerror(int);
-/* void               _System sethostfile(const char *); */
-int *               _System tcp_h_errno1(void);
+const char *        TCPCALL hstrerror(int);
+/* void               TCPCALL sethostfile(const char *); */
+int *               TCPCALL tcp_h_errno1(void);
 #endif