Author: madcoder
Date: 2007-02-12 15:51:10 +0100 (Mon, 12 Feb 2007)
New Revision: 1984
Removed:
glibc-package/branches/glibc-2.5/debian/patches/any/submitted-argph.h.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
that patch is not a good idea, see
Signed-off-by: Pierre Habouzit <[EMAIL PROTECTED]>
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-12 11:11:43 UTC
(rev 1983)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-12 14:51:10 UTC
(rev 1984)
@@ -144,9 +144,6 @@
wasn't used anyway). Closes: #165417.
* Rework patch for #340871 (patches/m68k/local-mathinline_h.diff to use
__NTH rather than __THROW) in function implementations.
- * patches/any/submitted-argph.h.diff: always have the same __NTH/__THROW
- definition everywhere in the glibc, and do not depend upon the includes
- ordering for it to be defined correctly. Closes: #377416.
* Fix rpcgen(1) manpage, to match rpcgen(1) behaviour more closely.
Closes: #46175.
* patches/any/submitted-date-and-unknown-tz.diff: fix date output in case of
Deleted:
glibc-package/branches/glibc-2.5/debian/patches/any/submitted-argph.h.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/submitted-argph.h.diff
2007-02-12 11:11:43 UTC (rev 1983)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/submitted-argph.h.diff
2007-02-12 14:51:10 UTC (rev 1984)
@@ -1,45 +0,0 @@
-Index: glibc-2.5/argp/argp.h
-===================================================================
---- glibc-2.5.orig/argp/argp.h
-+++ glibc-2.5/argp/argp.h
-@@ -33,13 +33,36 @@
- # define __const const
- #endif
-
--#ifndef __THROW
--# define __THROW
-+#ifdef __THROW
-+# undef __THROW
- #endif
--#ifndef __NTH
--# define __NTH(fct) fct __THROW
-+#ifdef __NTH
-+# undef __NTH
- #endif
-
-+#ifdef __GNUC__
-+
-+/* see <sys/cdefs.h> */
-+# if !defined __cplusplus && __GNUC_PREREQ (3, 3)
-+# define __THROW __attribute__ ((__nothrow__))
-+# define __NTH(fct) __attribute__ ((__nothrow__)) fct
-+# else
-+# if defined __cplusplus && __GNUC_PREREQ (2,8)
-+# define __THROW throw ()
-+# define __NTH(fct) fct throw ()
-+# else
-+# define __THROW
-+# define __NTH(fct) fct
-+# endif
-+# endif
-+
-+#else /* Not GCC. */
-+
-+# define __THROW
-+# define __NTH(fct) fct
-+
-+#endif /* GCC. */
-+
- #ifndef __attribute__
- /* This feature is available in gcc versions 2.5 and later. */
- # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-12
11:11:43 UTC (rev 1983)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2007-02-12
14:51:10 UTC (rev 1984)
@@ -130,5 +130,4 @@
any/submitted-nis-netgrp.diff -p0
any/submitted-getcwd-sys_param_h.diff -p0
any/submitted-clock-settime.diff -p0
-any/submitted-argph.h.diff
any/submitted-date-and-unknown-tz.diff -p0
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
