diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-10 01:10:55 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-10 01:10:55 +0000 |
commit | be954a5547b18eb5f78c22fa36000eab2daa3655 (patch) | |
tree | 9bb6c9b235963c9b6b94fb54c8cf786273875da0 /packages/ixp4xx/ixp-osal-2.1/assert.patch | |
parent | f3630ccede2047ba388d7b930f40c1c2d840cf4c (diff) | |
parent | 2f0e3d2a376647127e9d569aa9d2ab0ae2211843 (diff) |
merge of d2b50db8c3a2dfa93a56f34063e7e78182ac274c
and ef11dd4e8067d9c4f020b6cd39b8556bab34dc7a
Diffstat (limited to 'packages/ixp4xx/ixp-osal-2.1/assert.patch')
-rw-r--r-- | packages/ixp4xx/ixp-osal-2.1/assert.patch | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/packages/ixp4xx/ixp-osal-2.1/assert.patch b/packages/ixp4xx/ixp-osal-2.1/assert.patch index 1dfc84ed12..a03113dcc2 100644 --- a/packages/ixp4xx/ixp-osal-2.1/assert.patch +++ b/packages/ixp4xx/ixp-osal-2.1/assert.patch @@ -1,7 +1,11 @@ # Unnecessary patch - reduces the code size slightly, gives clearer # messages if IX_OSAL_ENSURE_ON is set ---- ixp_osal/include/IxOsalAssert.h 2005-11-20 15:19:59.128189352 -0800 -+++ ixp_osal/include/IxOsalAssert.h 2005-11-20 15:20:46.099145048 -0800 +# include/IxOsalAssert.h | 4 ++-- +# os/linux/include/core/IxOsalOsAssert.h | 9 ++++++++- +# 2 files changed, 10 insertions(+), 3 deletions(-) +# +--- ixp_osal/include/IxOsalAssert.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/include/IxOsalAssert.h 1970-01-01 00:00:00.000000000 +0000 @@ -72,8 +72,8 @@ */ #ifdef IX_OSAL_ENSURE_ON @@ -13,8 +17,8 @@ #else #define IX_OSAL_ENSURE(c, str) ---- ixp_osal/os/linux/include/core/IxOsalOsAssert.h 2005-09-24 20:57:00.000000000 -0700 -+++ ixp_osal/os/linux/include/core/IxOsalOsAssert.h 2005-11-20 15:25:32.273152843 -0800 +--- ixp_osal/os/linux/include/core/IxOsalOsAssert.h 1970-01-01 00:00:00.000000000 +0000 ++++ ixp_osal/os/linux/include/core/IxOsalOsAssert.h 1970-01-01 00:00:00.000000000 +0000 @@ -47,11 +47,18 @@ #ifndef IxOsalOsAssert_H |