libparted: don't use _GL_ATTRIBUTE_CONST in public parted.h, ...

[android-x86/external-parted.git] / include / parted / parted.h

diff --git a/include/parted/parted.h b/include/parted/parted.h
index 1302d8f..dff6dca 100644 (file)
--- a/include/parted/parted.h
+++ b/include/parted/parted.h
@@ -1,6 +1,6 @@
 /*
     libparted - a library for manipulating disk partitions
-    Copyright (C) 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
+    Copyright (C) 1999-2001, 2007, 2009-2012 Free Software Foundation, Inc.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,11 +19,17 @@
 #ifndef PARTED_H_INCLUDED
 #define PARTED_H_INCLUDED
 
+#define PED_DEFAULT_ALIGNMENT (1024 * 1024)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct _PedArchitecture PedArchitecture;
+#if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
+# define __attribute(arg) __attribute__ (arg)
+#else
+# define __attribute(arg)
+#endif
 
 #include <parted/constraint.h>
 #include <parted/device.h>
@@ -37,24 +43,15 @@ typedef struct _PedArchitecture PedArchitecture;
 #include <stdlib.h>
 #include <string.h>
 
-struct _PedArchitecture {
-       PedDiskArchOps*         disk_ops;
-       PedDeviceArchOps*       dev_ops;
-};
-
-extern const PedArchitecture*  ped_architecture;
-
-/* the architecture can't be changed if there are any PedDevice's.
- * i.e. you should only be doing this if it's the FIRST thing you do...
- */
-extern int ped_set_architecture (const PedArchitecture* arch);
-
-extern const char* ped_get_version ();
+extern const char *ped_get_version ()
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
+  __attribute ((__const__));
+#endif
 
 extern void* ped_malloc (size_t size);
 extern void* ped_calloc (size_t size);
 extern int ped_realloc (void** ptr, size_t size);
-extern void ped_free (void* ptr);
+extern void free (void* ptr);
 
 #ifdef __cplusplus
 }