[Pvfs2-cvs] commit by mtmoore in pvfs2/src/server: proto-error.sm

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/server
In directory parlweb1:/tmp/cvs-serv5622/src/server

Modified Files:
      Tag: Orange-Branch
	proto-error.sm 
Log Message:
Namespace collision of ENCODING_DEFAULT with an in-tree kernel module in newer (circa 2.6.33) kernels, just a #define rename.


Index: proto-error.sm
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/server/proto-error.sm,v
diff -p -u -r1.11 -r1.11.8.1
--- proto-error.sm	6 Mar 2009 22:06:03 -0000	1.11
+++ proto-error.sm	21 Dec 2010 15:34:12 -0000	1.11.8.1
@@ -52,7 +52,7 @@ static PINT_sm_action proto_error_init(
 		      PINT_ENCODE_RESP,
 		      &(s_op->encoded),
 		      s_op->addr,
-		      ENCODING_DEFAULT);
+		      PVFS2_ENCODING_DEFAULT);
     if (ret < 0)
     {
 	gossip_lerr("Error: PINT_encode() failure.\n");