more changes for iocCore port

src/libCom/env/bldEnvData.pl

@@ -23,7 +23,7 @@ chdir $config_dir or die "cannot change dir to $config_dir";
 $config_dir=cwd();
 chdir $start_dir;
 
-$SRC      = "../../../misc/generic/envDefs.h";
+$SRC      = "../../misc/generic/envDefs.h";
 $env_data = "${config_dir}/CONFIG_ENV";
 $site_data= "${config_dir}/CONFIG_SITE_ENV";
 $out_name = "envData.c";

src/libCom/env/envDefs.h

@@ -35,7 +35,6 @@
  * .08  03-18-97	joh 	remove env param length limit	
  *
  * make options
- *	-DvxWorks	makes a version for VxWorks
  *	-DNDEBUG	don't compile assert() checking
  *      -DDEBUG         compile various debug code, including checks on
  *                      malloc'd memory

src/libCom/env/envSubr.c

@@ -41,7 +41,6 @@
  * .11  03-18-97        joh    	remove env param length limits 
  *
  * make options
- *	-DvxWorks	makes a version for VxWorks
  *	-DNDEBUG	don't compile assert() checking
  *      -DDEBUG         compile various debug code, including checks on
  *                      malloc'd memory

src/libCom/error/error.h

@@ -35,7 +35,6 @@
 #ifndef INCerrorh
 #define INCerrorh 1
 
-#define LOCAL   static
 #define NELEMENTS(array)		/* number of elements in an array */ \
 		(sizeof (array) / sizeof ((array) [0]))
 

src/libCom/error/makeStatTbl.pl

@@ -57,9 +57,6 @@ print OUT " *       FROM $dir\n";
 print OUT " *         ON " . localtime() . "\n";
 print OUT " */\n";
 print OUT "\n";
-print OUT "#ifdef vxWorks\n";
-print OUT "#include \"vxWorks.h\"\n";
-print OUT "#endif\n";
 print OUT "#include \"errMdef.h\"\n";
 print OUT "#include \"errSymTbl.h\"\n";
 print OUT "\n";

src/libCom/fdmgr/fdmgr.h

@@ -49,6 +49,8 @@ extern "C" {
 #include "ellLib.h"
 #include "bucketLib.h"
 #include "osiSock.h"
+#include "osiSem.h"
+#include "osiThread.h"
 #include "shareLib.h"
 
 enum fdi_type {fdi_read, fdi_write, fdi_excp};
@@ -68,18 +70,14 @@ typedef struct{
 	unsigned	nextAlarmId;
     SOCKET		maxfd;
 	int		select_tmo;
-#	if defined (vxWorks)
-	SEM_ID		lock;
-    SEM_ID		fdmgr_pend_event_lock;
-	SEM_ID		expired_alarm_lock;
-	SEM_ID		fd_handler_lock;
+	semId		lock;
+    semId		fdmgr_pend_event_lock;
+	semId		expired_alarm_lock;
+	semId		fd_handler_lock;
 	unsigned long   clk_rate;       /* ticks per sec */
 	unsigned long	last_tick_count;
 	unsigned long	sec_offset;
-	WIND_TCB	*fdmgr_pend_event_tid;
-#	else 
-	unsigned	fdmgr_pend_event_in_use;
-#	endif
+	threadId	*fdmgr_pend_event_tid;
 }fdctx;
 
 /*