--- a/Socket.st	Fri Mar 29 04:33:47 1996 +0100
+++ b/Socket.st	Tue Apr 02 23:30:08 1996 +0200
@@ -809,9 +809,9 @@
 	RETURN ( nil );
     }
     if (hp != NULL)
-	RETURN (_MKSTRING(hp->h_name COMMA_CON));
+	RETURN (__MKSTRING(hp->h_name COMMA_CON));
 
-    RETURN (_MKSTRING(inet_ntoa(sa.sin_addr) COMMA_CON));
+    RETURN (__MKSTRING(inet_ntoa(sa.sin_addr) COMMA_CON));
 %}
 
     "
@@ -859,10 +859,10 @@
     }
 
     sa.sin_addr.s_addr = ntohl(sa.sin_addr.s_addr);    
-    b1 = _MKSMALLINT((sa.sin_addr.s_addr >> 24) & 0xFF);
-    b2 = _MKSMALLINT((sa.sin_addr.s_addr >> 16) & 0xFF);
-    b3 = _MKSMALLINT((sa.sin_addr.s_addr >> 8) & 0xFF);
-    b4 = _MKSMALLINT((sa.sin_addr.s_addr >> 0) & 0xFF);
+    b1 = __MKSMALLINT((sa.sin_addr.s_addr >> 24) & 0xFF);
+    b2 = __MKSMALLINT((sa.sin_addr.s_addr >> 16) & 0xFF);
+    b3 = __MKSMALLINT((sa.sin_addr.s_addr >> 8) & 0xFF);
+    b4 = __MKSMALLINT((sa.sin_addr.s_addr >> 0) & 0xFF);
 %}
 .
     ^ ByteArray with:b1 with:b2 with:b3 with:b4
@@ -969,12 +969,12 @@
     if (__isString(aNameOrNumber)) {
 	servent = getservbyname((char *) _stringVal(aNameOrNumber), protocol);
 	if (servent != NULL) {
-	    RETURN ( _MKSMALLINT(ntohs(servent->s_port)) );
+	    RETURN ( __MKSMALLINT(ntohs(servent->s_port)) );
 	}
 	if (tryBoth) {
 	    servent = getservbyname((char *) _stringVal(aNameOrNumber), "udp");
 	    if (servent != NULL) {
-		RETURN ( _MKSMALLINT(ntohs(servent->s_port)) );
+		RETURN ( __MKSMALLINT(ntohs(servent->s_port)) );
 	    }
 	}
 	RETURN ( nil );
@@ -1013,7 +1013,7 @@
 	}
     }
     if (servent) {
-	RETURN ( _MKSTRING(servent->s_proto COMMA_CON) );
+	RETURN ( __MKSTRING(servent->s_proto COMMA_CON) );
     }
     RETURN ( nil );
 %}
@@ -1096,7 +1096,7 @@
     addrBytes := ByteArray new:100.
 %{
     OBJ oClass;
-    OBJ fp = _INST(filePointer);
+    OBJ fp = __INST(filePointer);
     int nInstVars, nInstBytes, objSize;
     int sock;
     struct sockaddr_in sa ;
@@ -1123,7 +1123,7 @@
 	nInstVars = _intVal(_ClassInstPtr(oClass)->c_ninstvars);
 	nInstBytes = OHDR_SIZE + nInstVars * sizeof(OBJ);
 	objSize = _Size(aDataBuffer) - nInstBytes;
-	cp = (char *)_InstPtr(aDataBuffer) + nInstBytes;
+	cp = (char *)__InstPtr(aDataBuffer) + nInstBytes;
 	if (__isSmallInteger(startIndex)) {
 	    cp += __intVal(startIndex);
 	    objSize -= __intVal(startIndex);
@@ -1152,17 +1152,17 @@
 		nInstVars = _intVal(_ClassInstPtr(oClass)->c_ninstvars);
 		nInstBytes = OHDR_SIZE + nInstVars * sizeof(OBJ);
 		objSize = _Size(addrBytes) - nInstBytes;
-		cp = (char *)_InstPtr(addrBytes) + nInstBytes;
+		cp = (char *)__InstPtr(addrBytes) + nInstBytes;
 		if (objSize < alen) 
 		    goto bad;
 		bcopy((char *)&sa, cp, alen);
-		addrLen = _MKSMALLINT(alen);
+		addrLen = __MKSMALLINT(alen);
 	    }
 	}
 	if (n < 0) {
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
 	}
-	nReceived = _MKSMALLINT(n);
+	nReceived = __MKSMALLINT(n);
     }
 bad: ;
 %}.
@@ -1227,7 +1227,7 @@
     ].
 %{
     OBJ oClass;
-    OBJ fp = _INST(filePointer);
+    OBJ fp = __INST(filePointer);
     int nInstVars, nInstBytes, objSize;
     int sock;
     struct sockaddr_in sa;
@@ -1290,7 +1290,7 @@
 	nInstVars = _intVal(_ClassInstPtr(oClass)->c_ninstvars);
 	nInstBytes = OHDR_SIZE + nInstVars * sizeof(OBJ);
 	objSize = __qSize(aDataBuffer) - nInstBytes;
-	cp = (char *)_InstPtr(aDataBuffer) + nInstBytes;
+	cp = (char *)__InstPtr(aDataBuffer) + nInstBytes;
 	cp += offs;
 	if ((offs + nBytes) > objSize) {
 /*
@@ -1316,9 +1316,9 @@
 	__END_INTERRUPTABLE__
 
 	if (n < 0) {
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
 	}
-	RETURN (_MKSMALLINT(n));
+	RETURN (__MKSMALLINT(n));
     }
 bad: ;
 %}.
@@ -1403,7 +1403,7 @@
 	^ self error:'not a valid socket'
     ].
 %{
-    OBJ t = _INST(filePointer);
+    OBJ t = __INST(filePointer);
     OBJ myDomain;
     int sock;
     union {
@@ -1415,13 +1415,13 @@
     int on = 1;
     int ok;
 
-    if (!__isString(_INST(domain)) && !__isSymbol(_INST(domain))) {
+    if (!__isString(__INST(domain)) && !__isSymbol(__INST(domain))) {
 	DBGPRINTF(("SOCKET: invalid domain arg\n"));
 	RETURN (false);
     }
 
     ok = 0;
-    myDomain = _INST(domain);
+    myDomain = __INST(domain);
 #ifdef AF_INET
     if (myDomain == @symbol(inet)) {
 	/*
@@ -1520,7 +1520,7 @@
 
     if (ret < 0) {
 	DBGPRINTF(("SOCKET: bind failed errno=%d\n", errno));
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(errno);
 	RETURN (false);
     }
 %}.
@@ -1589,7 +1589,7 @@
 
     if (newSock < 0) {
 	DBGPRINTF(("SOCKET: accept call failed errno=%d\n", errno));
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(errno);
 	RETURN (false);
     }
 
@@ -1597,7 +1597,7 @@
      * extract the partners address
      */
 #ifdef AF_INET
-    if (_INST(domain) == @symbol(inet)) {
+    if (__INST(domain) == @symbol(inet)) {
 	he = gethostbyaddr((char *) &sa.in.sin_addr.s_addr, alen, AF_INET) ;
 	if (! he) {
 	    unsigned long norder;
@@ -1610,11 +1610,11 @@
 		    norder & 0xFF);
 	}
 	DBGPRINTF(("SOCKET: accepted connection from host %s\n", (he ? he->h_name : dotted))) ;
-	_INST(peerName) = _MKSTRING((he ? he->h_name : dotted) COMMA_CON);
+	__INST(peerName) = __MKSTRING((he ? he->h_name : dotted) COMMA_CON);
     }
 #endif
 #ifdef AF_UNIX
-    if (_INST(domain) == @symbol(unix)) {
+    if (__INST(domain) == @symbol(unix)) {
 	DBGPRINTF(("SOCKET: accepted connection on unix socket\n")) ;
 	/* nothing to be done here */
     }
@@ -1626,15 +1626,15 @@
     fp = fdopen(newSock, "r+");
     if (! fp) {
 	DBGPRINTF(("SOCKET: fdopen call failed\n"));
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(errno);
 	close(newSock);
 	RETURN (false);
     } else {
 #ifdef NO_BUFFER 
 	setbuf(fp, NULL);
-	_INST(buffered) = false;
+	__INST(buffered) = false;
 #endif
-	_INST(filePointer) = __MKOBJ(fp);
+	__INST(filePointer) = __MKOBJ(fp);
     }
 %}.
     mode := #readwrite.
@@ -1651,7 +1651,7 @@
 
     OBJ t;
 
-    t = _INST(filePointer);
+    t = __INST(filePointer);
     if (t != nil) {
 	FILE *fp;
 
@@ -1659,7 +1659,7 @@
 	fflush(fp);
 	shutdown(fileno(fp), 2);
 	fclose(fp);
-	_INST(filePointer) = nil;
+	__INST(filePointer) = nil;
     }
 %}
 !
@@ -1678,7 +1678,7 @@
 	^ self error:'not a valid socket'
     ].
 %{
-    OBJ t = _INST(filePointer);
+    OBJ t = __INST(filePointer);
     OBJ myDomain;
     union {
 	struct sockaddr_in in ;
@@ -1693,13 +1693,13 @@
     int ok;
     int sockaddr_size;
 
-    if (!__isString(_INST(domain)) && !__isSymbol(_INST(domain))) {
+    if (!__isString(__INST(domain)) && !__isSymbol(__INST(domain))) {
 	DBGPRINTF(("SOCKET: invalid domain arg\n"));
 	RETURN (false);
     }
 
     ok = 0;
-    myDomain = _INST(domain);
+    myDomain = __INST(domain);
     bzero((char *) &sa, sizeof(sa)) ;
 #ifdef AF_INET
     if (myDomain == @symbol(inet)) {
@@ -1827,7 +1827,7 @@
 	    }
 	}
 #endif
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(errno);
 	RETURN (false);
     }
 %}.
@@ -1876,7 +1876,7 @@
 	^ self error:'not a valid socket'
     ].
 %{
-    OBJ fp = _INST(filePointer);
+    OBJ fp = __INST(filePointer);
     int sock;
     int ret;
 
@@ -1895,7 +1895,7 @@
 
     if (ret < 0) {
 	DBGPRINTF(("SOCKET: listen call failed errno=%d\n", errno));
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(errno);
 	RETURN (false);
     }
 %}.
@@ -1910,12 +1910,12 @@
 
     OBJ fp;
 
-    fp = _INST(filePointer);
+    fp = __INST(filePointer);
     if (fp != nil) {
 	FILE *f;
 	int fd;
 
-	_INST(filePointer) = nil;
+	__INST(filePointer) = nil;
 	f = __FILEVal(fp);
 	fd = fileno(f);
 	__BEGIN_INTERRUPTABLE__
@@ -2111,7 +2111,7 @@
 
     if (sock < 0) {
         DBGPRINTF(("SOCKET: socket(dom=%d typ=%d proto=%d) call failed errno=%d\n", dom, typ, proto, errno));
-        _INST(lastErrorNumber) = _MKSMALLINT(errno);
+        __INST(lastErrorNumber) = __MKSMALLINT(errno);
     } else {
         /* 
          * make it a FILE * 
@@ -2119,12 +2119,12 @@
         fp = fdopen(sock, "r+");
         if (! fp) {
             DBGPRINTF(("SOCKET: fdopen call failed\n"));
-            _INST(lastErrorNumber) = _MKSMALLINT(errno);
+            __INST(lastErrorNumber) = __MKSMALLINT(errno);
             __BEGIN_INTERRUPTABLE__
             close(sock);
             __END_INTERRUPTABLE__
         } else {
-            _INST(filePointer) = __MKOBJ(fp);
+            __INST(filePointer) = __MKOBJ(fp);
         }
     }
 %}.
@@ -2205,7 +2205,7 @@
 
     if (sock < 0) {
 	DBGPRINTF(("SOCKET: socket(dom=%d typ=%d proto=0) call failed errno=%d\n", sa.sin_family, SOCK_STREAM, errno));
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(errno);
     } else {
 	/* 
 	 * connect/bind 
@@ -2235,7 +2235,7 @@
 
 	if (ret < 0) { 
 	    DBGPRINTF(("SOCKET: bind/connect call failed errno=%d\n", errno));
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    __BEGIN_INTERRUPTABLE__
 	    close(sock) ;
 	    __END_INTERRUPTABLE__
@@ -2246,16 +2246,16 @@
 	    fp = fdopen(sock, "r+");
 	    if (! fp) {
 		DBGPRINTF(("SOCKET: fdopen failed\n"));
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		__INST(lastErrorNumber) = __MKSMALLINT(errno);
 		__BEGIN_INTERRUPTABLE__
 		close(sock);
 		__END_INTERRUPTABLE__
 	    } else {
 #ifdef NO_BUFFER 
 		setbuf(fp, NULL);
-		_INST(buffered) = false;
+		__INST(buffered) = false;
 #endif
-		_INST(filePointer) = __MKOBJ(fp);
+		__INST(filePointer) = __MKOBJ(fp);
 	    }
 	}
     }
@@ -2339,7 +2339,7 @@
 
     if (sock < 0) {
 	DBGPRINTF(("SOCKET: socket(dom=%d typ=%d proto=0) call failed errno=%d\n", sa.sin_family, SOCK_DGRAM, errno));
-	_INST(lastErrorNumber) = _MKSMALLINT(errno);
+	__INST(lastErrorNumber) = __MKSMALLINT(errno);
     } else {
 	/* 
 	 * ok,
@@ -2361,7 +2361,7 @@
 
 	if (ret < 0) {
 	    DBGPRINTF(("SOCKET: bind/connect call failed\n"));
-	    _INST(lastErrorNumber) = _MKSMALLINT(errno);
+	    __INST(lastErrorNumber) = __MKSMALLINT(errno);
 	    __BEGIN_INTERRUPTABLE__
 	    close(sock) ;
 	    __END_INTERRUPTABLE__
@@ -2372,16 +2372,16 @@
 	    fp = fdopen(sock, "r+");
 	    if (! fp) {
 		DBGPRINTF(("SOCKET: fdopen call failed\n"));
-		_INST(lastErrorNumber) = _MKSMALLINT(errno);
+		__INST(lastErrorNumber) = __MKSMALLINT(errno);
 		__BEGIN_INTERRUPTABLE__
 		close(sock);
 		__END_INTERRUPTABLE__
 	    } else {
 #ifdef NO_BUFFER 
 		setbuf(fp, NULL);
-		_INST(buffered) = false;
+		__INST(buffered) = false;
 #endif
-		_INST(filePointer) = __MKOBJ(fp);
+		__INST(filePointer) = __MKOBJ(fp);
 	    }
 	}
     }
@@ -2420,7 +2420,7 @@
 %{
 #if defined(SO_RCVTIMEO) && defined(SOL_SOCKET) && defined(HZ)
     if (__isSmallInteger(millis)) {
-	OBJ fp = _INST(filePointer);
+	OBJ fp = __INST(filePointer);
 	int sock;
 	int opt;
 
@@ -2448,7 +2448,7 @@
 %{
 #if defined(SO_SNDTIMEO) && defined(SOL_SOCKET) && defined(HZ)
     if (__isSmallInteger(millis)) {
-	OBJ fp = _INST(filePointer);
+	OBJ fp = __INST(filePointer);
 	int sock;
 	int opt;
 
@@ -2465,5 +2465,5 @@
 !Socket class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.55 1996-03-19 15:47:29 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.56 1996-04-02 21:29:51 cg Exp $'
 ! !