diff options
| author |   John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 23:06:24 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 23:06:24 +0000 |
| commit | 4512542b1843804bb19fd108a613f903c1d885a0 (patch) | |
| tree | e8d798695143603f4f392cd2485dff6eed23fa90 /packages/ixp4xx/ixp-osal-2.1/assert.patch | |
| parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
| download | openembedded-4512542b1843804bb19fd108a613f903c1d885a0.tar.gz | |
ixp-osal: merge with latest nslu2 CVS patch set in 2.1
- there is no significant change in this merge, just whitespace
- at the end of a couple of source file lines. All patches are
- now 'sanitised' to remove the date stamps (which otherwise
- make comparisons difficult).
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 |