diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | CHANGES | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/.cvsignore b/.cvsignore index cc3ccd07f..be311e58c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -5,7 +5,7 @@ aclocal.m4.bak autom4te.cache compile config.guess -config.h +curl_config.h config.log config.lt config.status diff --git a/Android.mk b/Android.mk index 7ed3b0967..11b26398b 100644 --- a/Android.mk +++ b/Android.mk @@ -3,7 +3,7 @@ # Android source tree. Then build them with 'make curl' or just 'make libcurl' # from the Android root. # -# Note: you must first create a config.h file by running configure in the +# Note: you must first create a curl_config.h file by running configure in the # Android environment. I haven't found an easy way to do this yet. If there is # no easy way, a static config-android.h may need to be created and checked in # to the libcurl source tree. @@ -6,6 +6,10 @@ Changelog +Guenter Knauf (14 Jul 2009) +- renamed generated config.h to curl_config.h to avoid any future clashes + with config.h from other projects. + Daniel Stenberg (9 Jul 2009) - Eric Wong introduced curlx_nonblock() that the curl tool now (re-)uses for setting a file descriptor non-blocking. Used by the functionality Eric |