--- henv.ci.orig	Sat Apr 24 03:39:14 1999
+++ henv.ci	Tue Nov 28 10:55:35 2000
@@ -29,12 +29,10 @@
  * on HP/UX s300/s400, CLI_NAME_PREFIX is defined in Config.mk as "_SQL" 
  * on AIX 3.x 4.x,     CLI_NAME_PREFIX is defined in Config.mk as ".SQL" 
  */
-#ifndef	CLI_NAME_PREFIX
+#ifndef	NEED_USCORE
 #  define CLI_NAME_PREFIX	"SQL"	/* using call by value prefix */ 
 #else
-# ifdef USE_SYMBOL_UNDERSCORE
 #  define CLI_NAME_PREFIX	"_SQL"
-# endif
 #endif
 
 static struct
