diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-18 15:28:23 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-18 15:28:23 +0000 |
| commit | 20b7f38ce5b7a6c562778d01164df8efc12b512a (patch) | |
| tree | 476f91f1a5dc5120b08ee6063ffbadd013805a59 /packages/amule/files | |
| parent | 3f4428a1a467d2e10b64d849699008476bcd0830 (diff) | |
| parent | cdd1cf3fc9732b6bc5437f53293f445472cf875c (diff) | |
merge of '7c0a885daa3893962bf21628fe340b191ecb0259'
and 'fdb543591628f771630c9bdf28e86d3e0911be03'
Diffstat (limited to 'packages/amule/files')
| -rw-r--r-- | packages/amule/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/amule/files/parser.patch | 20 |
2 files changed, 20 insertions, 0 deletions
diff --git a/packages/amule/files/.mtn2git_empty b/packages/amule/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/amule/files/.mtn2git_empty diff --git a/packages/amule/files/parser.patch b/packages/amule/files/parser.patch new file mode 100644 index 0000000000..ee77c42380 --- /dev/null +++ b/packages/amule/files/parser.patch @@ -0,0 +1,20 @@ +diff -ur aMule-2.1.0_orig/src/Parser.cpp aMule-2.1.0/src/Parser.cpp +--- aMule-2.1.0_orig/src/Parser.cpp 2005-12-20 05:13:25.000000000 +0100 ++++ aMule-2.1.0/src/Parser.cpp 2006-01-29 15:16:45.000000000 +0100 +@@ -203,14 +203,14 @@ + # define YYMALLOC malloc + # if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ ++/*void *malloc (YYSIZE_T);*/ /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifndef YYFREE + # define YYFREE free + # if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \ + && (defined (__STDC__) || defined (__cplusplus))) +-void free (void *); /* INFRINGES ON USER NAME SPACE */ ++/*void free (void *);*/ /* INFRINGES ON USER NAME SPACE */ + # endif + # endif + # ifdef __cplusplus |