[Pvfs2-cvs] commit by aching in pvfs2-1/src/apps/vis: pvfs2-vis-bw-2d.c simple.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/apps/vis
In directory parlweb1:/tmp/cvs-serv19729/apps/vis

Modified Files:
      Tag: locking-branch
	pvfs2-vis-bw-2d.c simple.c 
Log Message:

Reverse merged and ported to HEAD.


Index: pvfs2-vis-bw-2d.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/apps/vis/pvfs2-vis-bw-2d.c,v
diff -p -u -r1.16 -r1.16.50.1
--- pvfs2-vis-bw-2d.c	28 Jul 2004 14:32:30 -0000	1.16
+++ pvfs2-vis-bw-2d.c	21 Jul 2008 18:19:49 -0000	1.16.50.1
@@ -10,6 +10,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
+#include <getopt.h>
 
 #include <SDL.h>
 #include <SDL_ttf.h>
@@ -97,9 +98,6 @@ int main(int argc, char **argv)	
  */
 static struct options* parse_args(int argc, char* argv[])
 {
-    /* getopt stuff */
-    extern char* optarg;
-    extern int optind, opterr, optopt;
     char flags[] = "vm:w:i:";
     int one_opt = 0;
     int len = 0;

Index: simple.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/apps/vis/simple.c,v
diff -p -u -r1.7 -r1.7.30.1
--- simple.c	11 Nov 2005 21:30:59 -0000	1.7
+++ simple.c	21 Jul 2008 18:19:49 -0000	1.7.30.1
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <getopt.h>
 
 #include "pvfs2.h"
 #include "pvfs2-vis.h"
@@ -75,9 +76,6 @@ int main(int argc, char **argv)	
  */
 static struct options* parse_args(int argc, char* argv[])
 {
-    /* getopt stuff */
-    extern char* optarg;
-    extern int optind, opterr, optopt;
     char flags[] = "vm:";
     int one_opt = 0;
     int len = 0;