Changeset 10554


Ignore:
Timestamp:
Jan 22, 2005, 4:34:37 PM (15 years ago)
Author:
jberry
Message:

Fix patch mangled by cvs keywords

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/java/commons-daemon/files/patch-native-dso-dyld.c

    r10549 r10554  
    1 --- src/native/unix/native/dso-dyld.c.orig      2005-01-22 07:15:01.000000000 -0800
    2 +++ src/native/unix/native/dso-dyld.c   2005-01-22 07:17:47.000000000 -0800
    3 @@ -14,12 +14,17 @@
    4     limitations under the License.
    5  */
    6  /* @version $Id: patch-native-dso-dyld.c,v 1.1 2005/01/22 15:31:51 jberry Exp $ */
     1--- src/native/unix/native/dso-dyld.c.orig      2004-02-09 07:55:21.000000000 -0800
     2+++ src/native/unix/native/dso-dyld.c   2005-01-22 08:27:20.000000000 -0800
     3@@ -17 +16,0 @@
    74-#include "jsvc.h"
    8  
    9  #ifdef DSO_DYLD
    10  
    11  #include <mach-o/dyld.h>
    12  
     5@@ -21,0 +21,5 @@
    136+/* dyld.h hauls in stdbool, which jsvc doesn't expect; undo that */
    147+#undef false
     
    169+#undef bool
    1710+#include "jsvc.h"
    18 +
    19  /* Print an error message and abort all if a specified symbol wasn't found */
    20  static void nosymbol(const char *s) {
    21      log_error("Cannot find symbol '%s' in library",s);
    22 @@ -106,7 +111,7 @@
    23      /* Process the correct name (add a _ before the name) */
    24      while (nam[x]!='\0') x++;
    25      und=(char*)malloc(sizeof(char)*(x+2));
     11@@ -109 +113 @@
    2612-    while(x>=0) und[x+1]=nam[x--];
    2713+    for(; x>=0; --x) und[x+1]=nam[x];
    28      und[0]='_';
    29  
    30      /* Find the symbol */
Note: See TracChangeset for help on using the changeset viewer.