From: Jan Rękorajski <baggins@pld-linux.org>
Date: Wed, 25 Aug 2010 00:15:48 +0000 (+0000)
Subject: - rel 6
X-Git-Tag: auto/th/dietlibc-0_32-6
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdietlibc.git;a=commitdiff_plain;h=d45a8198908c904f59a032c669f93cc71954bacc

- rel 6
- fix macro variable names

Changed files:
    dietlibc-devmacros.patch -> 1.2
    dietlibc.spec -> 1.95
---

diff --git a/dietlibc-devmacros.patch b/dietlibc-devmacros.patch
index c6becdc..ee5c30a 100644
--- a/dietlibc-devmacros.patch
+++ b/dietlibc-devmacros.patch
@@ -8,17 +8,17 @@ diff -ur dietlibc-0.32/include/sys/stat.h dietlibc-0.32-devmacros/include/sys/st
 -#define major(dev) ({ unsigned long long l=(dev); ((l>>8) & 0xfff) | (l >> 32) & 0xfffff000; })
 -#define minor(dev) ({ unsigned long long l=(dev); (l & 0xff) | ((l>>12)&0xffffff00); })
 -#define makedev(maj,min) ({ unsigned long long a=(maj), i=(min); ((a&0xfff)<<8) | (i&0xff) | ((a&~0xfff)<<32) | ((i&0xfffff00)<<12); })
-+#define major(dev) \
-+	((unsigned int)((((unsigned long long int)(dev) >> 8) & 0xfff) \
-+		| ((unsigned int) ((unsigned long long int)(dev) >> 32) & ~0xfff)))
-+#define minor(dev) \
-+	((unsigned int)(((unsigned long long int)(dev) & 0xff) \
-+		| ((unsigned int) ((unsigned long long int)(dev) >> 12) & ~0xff)))
-+#define makedev(maj,min) \
-+	((unsigned long long int)(((unsigned int)(minor) & 0xff) \
-+		| (((unsigned int)(major) & 0xfff) << 8) \
-+		| (((unsigned long long int) ((minor) & ~0xff)) << 12) \
-+		| (((unsigned long long int) ((major) & ~0xfff)) << 32)))
++#define major(__dev) \
++	((unsigned int)((((unsigned long long int)(__dev) >> 8) & 0xfff) \
++		| ((unsigned int) ((unsigned long long int)(__dev) >> 32) & ~0xfff)))
++#define minor(__dev) \
++	((unsigned int)(((unsigned long long int)(__dev) & 0xff) \
++		| ((unsigned int) ((unsigned long long int)(__dev) >> 12) & ~0xff)))
++#define makedev(__maj,__min) \
++	((unsigned long long int)(((unsigned int)(__min) & 0xff) \
++		| (((unsigned int)(__maj) & 0xfff) << 8) \
++		| (((unsigned long long int) ((__min) & ~0xff)) << 12) \
++		| (((unsigned long long int) ((__maj) & ~0xfff)) << 32)))
  
  extern int chmod (const char *__file, mode_t __mode) __THROW;
  extern int fchmod (int __fd, mode_t __mode) __THROW;
diff --git a/dietlibc.spec b/dietlibc.spec
index 31dfb46..b81abd8 100644
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -12,7 +12,7 @@ Summary(pl.UTF-8):	Biblioteka standardowa C zoptymalizowana na rozmiar
 Summary(pt_BR.UTF-8):	libc pequena otimizada para tamanho
 Name:		dietlibc
 Version:	0.32
-Release:	5
+Release:	6
 Epoch:		2
 License:	GPL v2
 Group:		Development/Libraries