Index: sysdeps/solaris/cpu.c
===================================================================
RCS file: /cvs/gnome/libgtop/sysdeps/solaris/Attic/cpu.c,v
retrieving revision 1.4.2.1
diff -c -r1.4.2.1 cpu.c
*** sysdeps/solaris/cpu.c	14 Feb 2001 23:07:41 -0000	1.4.2.1
--- sysdeps/solaris/cpu.c	19 Jul 2003 00:17:23 -0000
***************
*** 35,43 ****
  (1L << GLIBTOP_CPU_SYS) + (1L << GLIBTOP_CPU_IDLE) +
  (1L << GLIBTOP_XCPU_TOTAL) + (1L << GLIBTOP_XCPU_USER) +
  (1L << GLIBTOP_XCPU_SYS) + (1L << GLIBTOP_XCPU_IDLE) +
- #if LIBGTOP_VERSION_CODE >= 1001002
- (1L << GLIBTOP_XCPU_FLAGS) +
- #endif
  (1L << GLIBTOP_CPU_FREQUENCY);
  
  /* Init function. */
--- 35,40 ----
***************
*** 79,92 ****
  	if (!ksp) continue;
  
  	++found;
! 	if(p_online(cpu, P_STATUS) == P_ONLINE)
! #if LIBGTOP_VERSION_CODE >= 1001002
! 	    buf->xcpu_flags |= (1L << cpu);
! #else
! 	    ;
! #endif
! 	else
  	    continue;
  	ret = kstat_read (kc, ksp, &cpu_stat);
  
  	if (ret == -1) {
--- 76,84 ----
  	if (!ksp) continue;
  
  	++found;
! 	if(p_online(cpu, P_STATUS) != P_ONLINE)
  	    continue;
+ 
  	ret = kstat_read (kc, ksp, &cpu_stat);
  
  	if (ret == -1) {
Index: sysdeps/solaris/procdata.c
===================================================================
RCS file: /cvs/gnome/libgtop/sysdeps/solaris/Attic/procdata.c,v
retrieving revision 1.5.2.1
diff -c -r1.5.2.1 procdata.c
*** sysdeps/solaris/procdata.c	14 Feb 2001 23:07:41 -0000	1.5.2.1
--- sysdeps/solaris/procdata.c	19 Jul 2003 00:17:23 -0000
***************
*** 123,132 ****
  	}
  	if(prcred->pr_ngroups >= 0)
  	{
- 	    if(prcred->pr_ngroups <= GLIBTOP_MAX_GROUPS)
- 	        toread = prcred->pr_ngroups * sizeof(gid_t);
- 	    else
- 	        toread = GLIBTOP_MAX_GROUPS * sizeof(gid_t);
  	    if(s_pread(fd, groups, toread,
  	               &(((struct prcred *)0)->pr_groups[0])) != toread)
  	               prcred->pr_ngroups = 0;
--- 123,128 ----
Index: sysdeps/solaris/procstate.c
===================================================================
RCS file: /cvs/gnome/libgtop/sysdeps/solaris/Attic/procstate.c,v
retrieving revision 1.2.2.1
diff -c -r1.2.2.1 procstate.c
*** sysdeps/solaris/procstate.c	14 Feb 2001 23:07:41 -0000	1.2.2.1
--- sysdeps/solaris/procstate.c	19 Jul 2003 00:17:23 -0000
***************
*** 27,39 ****
  #include <glibtop_private.h>
  
  static const unsigned long _glibtop_sysdeps_proc_state =
- #if (LIBGTOP_VERSION_CODE >= 1001002) && defined(HAVE_PROCFS_H)
- (1L << GLIBTOP_PROC_STATE_HAS_CPU) + (1L << GLIBTOP_PROC_STATE_PROCESSOR) +
- (1L << GLIBTOP_PROC_STATE_LAST_PROCESSOR) +
- #endif
- #if LIBGTOP_VERSION_CODE >= 1001002
- (1L << GLIBTOP_PROC_STATE_RUID) + (1L << GLIBTOP_PROC_STATE_RGID) +
- #endif
  (1L << GLIBTOP_PROC_STATE_CMD) + (1L << GLIBTOP_PROC_STATE_STATE) +
  (1L << GLIBTOP_PROC_STATE_UID) + (1L << GLIBTOP_PROC_STATE_GID);
  
--- 27,32 ----
***************
*** 63,72 ****
  
  	buf->uid = psinfo.pr_euid;
  	buf->gid = psinfo.pr_egid;
- #if LIBGTOP_VERSION_CODE >= 1001002
- 	buf->ruid = psinfo.pr_uid;
- 	buf->rgid = psinfo.pr_gid;
- #endif
  #ifdef HAVE_PROCFS_H
  	switch(psinfo.pr_lwp.pr_state)
  #else
--- 56,61 ----
***************
*** 74,121 ****
  #endif
  	{
  		case SONPROC: 
- #if (LIBGTOP_VERSION_CODE >= 1001002) && defined(HAVE_PROCFS_H)
- 			buf->has_cpu = 1;
- 			buf->processor = psinfo.pr_lwp.pr_onpro;
- #endif
  		case SRUN:
- #if LIBGTOP_VERSION_CODE >= 1001002
- 			buf->state = GLIBTOP_PROCESS_RUNNING;
- #else
  			buf->state = 'R';
- #endif
  			break;
  		case SZOMB:
- #if LIBGTOP_VERSION_CODE >= 1001002
- 			buf->state = GLIBTOP_PROCESS_ZOMBIE;
- #else
  			buf->state = 'Z';
- #endif
  			break;
  		case SSLEEP:
- #if LIBGTOP_VERSION_CODE >= 1001002
- 			buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
- #else
  			buf->state = 'S';
- #endif
  			break;
  		case SSTOP:
- #if LIBGTOP_VERSION_CODE >= 1001002
- 			buf->state = GLIBTOP_PROCESS_STOPPED;
- #else
  			buf->state = 'T';
- #endif
  			break;
  		case SIDL:
- #if LIBGTOP_VERSION_CODE >= 1001002
- 			buf->state = GLIBTOP_PROCESS_UNINTERRUPTIBLE;
- #else
  			buf->state = 'D';
- #endif
  	}
- #if (LIBGTOP_VERSION_CODE >= 1001002) && defined(HAVE_PROCFS_H)
- 	buf->last_processor = psinfo.pr_lwp.pr_onpro;
- #endif
  	strncpy (buf->cmd, psinfo.pr_fname, 39);
  
  	buf->flags = _glibtop_sysdeps_proc_state;
--- 63,83 ----
Index: sysdeps/solaris/procuid.c
===================================================================
RCS file: /cvs/gnome/libgtop/sysdeps/solaris/Attic/procuid.c,v
retrieving revision 1.2.2.1
diff -c -r1.2.2.1 procuid.c
*** sysdeps/solaris/procuid.c	14 Feb 2001 23:07:41 -0000	1.2.2.1
--- sysdeps/solaris/procuid.c	19 Jul 2003 00:17:23 -0000
***************
*** 33,48 ****
  (1L << GLIBTOP_PROC_UID_PGRP) + (1L << GLIBTOP_PROC_UID_SESSION) +
  (1L << GLIBTOP_PROC_UID_TTY) + (1L << GLIBTOP_PROC_UID_PRIORITY) +
  (1L << GLIBTOP_PROC_UID_NICE);
! static const unsigned long _glibtop_sysdeps_proc_uid_prcred =
! #if LIBGTOP_VERSION_CODE >= 1001002
! #ifdef HAVE_PROCFS_H
! (1L << GLIBTOP_PROC_UID_GROUPS) +
! #endif
! (1L << GLIBTOP_PROC_UID_SUID) + (1L << GLIBTOP_PROC_UID_SGID) +
! (1L << GLIBTOP_PROC_UID_NGROUPS);
! #else
! 0;
! #endif
  /* Init function. */
  
  void
--- 33,40 ----
  (1L << GLIBTOP_PROC_UID_PGRP) + (1L << GLIBTOP_PROC_UID_SESSION) +
  (1L << GLIBTOP_PROC_UID_TTY) + (1L << GLIBTOP_PROC_UID_PRIORITY) +
  (1L << GLIBTOP_PROC_UID_NICE);
! static const unsigned long _glibtop_sysdeps_proc_uid_prcred = 0;
! 
  /* Init function. */
  
  void
***************
*** 62,70 ****
  #endif
  #ifdef HAVE_PROCFS_H
  	struct psinfo psinfo;
- #if LIBGTOP_VERSION_CODE >= 1001002
- 	gid_t groups[GLIBTOP_MAX_GROUPS];
- #endif
  #else
  	struct prpsinfo psinfo;
  	gid_t groups[1];	/* dummy for consistent function prototype */
--- 54,59 ----
***************
*** 100,127 ****
  #endif
  
  	buf->flags = _glibtop_sysdeps_proc_uid_psinfo;
- 
- #if LIBGTOP_VERSION_CODE >= 1001002
- 	if(glibtop_get_proc_credentials_s(server, &prcred, groups, pid))
- 		return;
- 
- 	buf->suid = prcred.pr_suid;
- 	buf->sgid = prcred.pr_sgid;
- 	buf->ngroups = (prcred.pr_ngroups <= GLIBTOP_MAX_GROUPS) ?
- 	   		prcred.pr_ngroups : GLIBTOP_MAX_GROUPS;
- 
- #ifdef HAVE_PROCFS_H
- 	if(sizeof(int) == sizeof(gid_t))
- 	   	memcpy(buf->groups, &groups, buf->ngroups * sizeof(gid_t));
- 	else
- 	{
- 	   	int i;
- 
- 		for(i = 0; i < buf->ngroups; ++i)
- 		   	buf->groups[i] = groups[i];
- 	}
- #endif
- #endif
- 
  	buf->flags += _glibtop_sysdeps_proc_uid_prcred;
  }
--- 89,93 ----
Index: sysdeps/solaris/shm_limits.c
===================================================================
RCS file: /cvs/gnome/libgtop/sysdeps/solaris/Attic/shm_limits.c,v
retrieving revision 1.2.2.1
diff -c -r1.2.2.1 shm_limits.c
*** sysdeps/solaris/shm_limits.c	14 Feb 2001 23:07:41 -0000	1.2.2.1
--- sysdeps/solaris/shm_limits.c	19 Jul 2003 00:17:23 -0000
***************
*** 61,68 ****
  		    sizeof(struct shminfo)) != sizeof(struct shminfo))
  	        return;
          buf->shmmax = sinfo.shmmax;
- 	buf->shmmin = sinfo.shmmin;
  	buf->shmmni = sinfo.shmmni;
- 	buf->shmseg = sinfo.shmseg;
  	buf->flags = _glibtop_sysdeps_shm_limits;
  }
--- 61,66 ----
Index: sysdeps/solaris/uptime.c
===================================================================
RCS file: /cvs/gnome/libgtop/sysdeps/solaris/Attic/uptime.c,v
retrieving revision 1.2.2.1
diff -c -r1.2.2.1 uptime.c
*** sysdeps/solaris/uptime.c	14 Feb 2001 23:07:41 -0000	1.2.2.1
--- sysdeps/solaris/uptime.c	19 Jul 2003 00:17:23 -0000
***************
*** 27,35 ****
  #include <time.h>
  
  static const unsigned long _glibtop_sysdeps_uptime =
- #if LIBGTOP_VERSION_CODE >= 1001002
- (1L <<GLIBTOP_UPTIME_BOOT_TIME) +
- #endif
  (1L << GLIBTOP_UPTIME_UPTIME);
  
  /* Init function. */
--- 27,32 ----
***************
*** 49,57 ****
  
  	if(!(server->machine.boot))
  	    return;
- #if LIBGTOP_VERSION_CODE >= 1001002
- 	buf->boot_time = server->machine.boot;
- #endif
  	buf->uptime = time(NULL) - server->machine.boot;
  
  	buf->flags = _glibtop_sysdeps_uptime;
--- 46,51 ----
