Bump Apache dependency to Apache 2

@@ -18,10 +18,11 @@
  *
  * CDDL HEADER END
  */
 
 /*
+ * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  */
 

@@ -28,12 +29,10 @@
 #ifndef _PAPI_H
 #define _PAPI_H
 
 /* $Id: papi.h 161 2006-05-03 04:32:59Z njacobs $ */
 
-#pragma ident   "%Z%%M% %I%     %E% SMI"
-
 #include <sys/types.h>
 #include <time.h>
 #include <stdio.h>
 
 #ifdef __cplusplus

@@ -254,19 +253,19 @@
 extern papi_attribute_t **papiServiceGetAttributeList(papi_service_t handle);
 extern char *papiServiceGetStatusMessage(papi_service_t handle);
 
 /*      Attribute related        */
 extern papi_status_t papiAttributeListAddValue(papi_attribute_t ***attrs,
-                                        int flags, char *name,
+                                        int flags, const char *name,
                                         papi_attribute_value_type_t type,
                                         papi_attribute_value_t *value);
 extern papi_status_t papiAttributeListAddString(papi_attribute_t ***attrs,
                                         int flags, char *name, char *string);
 extern papi_status_t papiAttributeListAddInteger(papi_attribute_t ***attrs,
                                         int flags, char *name, int integer);
 extern papi_status_t papiAttributeListAddBoolean(papi_attribute_t ***attrs,
-                                        int flags, char *name, char boolean);
+                                        int flags, const char *name, char boolean);
 extern papi_status_t papiAttributeListAddRange(papi_attribute_t ***attrs,
                                         int flags, char *name,
                                         int lower, int upper);
 extern papi_status_t papiAttributeListAddResolution(papi_attribute_t ***attrs,
                                         int flags, char *name,

@@ -309,11 +308,11 @@
                                         papi_attribute_t ***collection);
 extern papi_status_t papiAttributeListGetMetadata(papi_attribute_t **list,
                                         void **iterator, char *name,
                                         papi_metadata_t *vptr);
 extern papi_attribute_t *papiAttributeListFind(papi_attribute_t **list,
-                                        char *name);
+                                        const char *name);
 extern papi_attribute_t *papiAttributeListGetNext(papi_attribute_t **list,
                                         void **iterator);
 extern void papiAttributeListFree(papi_attribute_t **attributes);
 
 extern papi_status_t papiAttributeListFromString(papi_attribute_t ***attrs,