Skip to content

Commit

Permalink
strcasecompare: replaced remaining rawstr.h with strcase.h
Browse files Browse the repository at this point in the history 
This is a followup to commit 811a693
  • Loading branch information
@dfandrich
dfandrich committed Oct 31, 2016
1 parent 4f97d98 commit 9363f1a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion lib/vtls/cyassl.c
View file
Expand Up @@ -55,7 +55,7 @@ and that's a problem since options.h hasn't been included yet. */
#include "parsedate.h"
#include "connect.h" /* for the connect timeout */
#include "select.h"
#include "rawstr.h"
#include "strcase.h"
#include "x509asn1.h"
#include "curl_printf.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/vtls/gtls.c
View file
Expand Up @@ -52,7 +52,7 @@
#include "parsedate.h"
#include "connect.h" /* for the connect timeout */
#include "select.h"
#include "rawstr.h"
#include "strcase.h"
#include "warnless.h"
#include "x509asn1.h"
#include "curl_printf.h"
Expand Down
1 change: 0 additions & 1 deletion lib/vtls/mbedtls.c
View file
Expand Up @@ -50,7 +50,6 @@
#include "parsedate.h"
#include "connect.h" /* for the connect timeout */
#include "select.h"
#include "rawstr.h"
#include "polarssl_threadlock.h"

/* The last 3 #include files should be in this order */
Expand Down
2 changes: 1 addition & 1 deletion lib/vtls/nss.c
View file
Expand Up @@ -64,7 +64,7 @@
#include <ocsp.h>
#endif

#include "rawstr.h"
#include "strcase.h"
#include "warnless.h"
#include "x509asn1.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/vtls/polarssl.c
View file
Expand Up @@ -54,7 +54,7 @@
#include "parsedate.h"
#include "connect.h" /* for the connect timeout */
#include "select.h"
#include "rawstr.h"
#include "strcase.h"
#include "polarssl_threadlock.h"
#include "curl_printf.h"
#include "curl_memory.h"
Expand Down
4 changes: 2 additions & 2 deletions projects/generate.bat
View file
Expand Up @@ -264,14 +264,14 @@ rem
for /f "delims=" %%r in ('dir /b ..\src\*.rc') do call :element %1 src "%%r" %3
) else if "!var!" == "CURL_SRC_X_C_FILES" (
call :element %1 lib "strtoofft.c" %3
call :element %1 lib "rawstr.c" %3
call :element %1 lib "strcase.c" %3
call :element %1 lib "nonblock.c" %3
call :element %1 lib "warnless.c" %3
) else if "!var!" == "CURL_SRC_X_H_FILES" (
call :element %1 lib "config-win32.h" %3
call :element %1 lib "curl_setup.h" %3
call :element %1 lib "strtoofft.h" %3
call :element %1 lib "rawstr.h" %3
call :element %1 lib "strcase.h" %3
call :element %1 lib "nonblock.h" %3
call :element %1 lib "warnless.h" %3
) else if "!var!" == "CURL_LIB_C_FILES" (
Expand Down

3 comments on commit 9363f1a

@jay
Copy link
Member

@jay jay commented on 9363f1a Nov 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dfandrich I just checked out f9e51fb and I cannot generate a working build unless I revert the changes here made to generate.bat. It looks like what's happening is the linkage is incorrect because curl_str(n)equal is expected to come from the DLL. If I no longer build strcase in curl but keep building it in libcurl where it's exported then it works. Does this sound correct, is it ok to reverse the changes to generate.bat?

@bagder
Copy link
Member

@bagder bagder commented on 9363f1a Nov 1, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should have neither rawstr.[ch] nor strcase.[ch] in there I think. The former file names are removed so they're gone now, but we've also now removed the use of strcase.[ch] from the tool build.

@jay
Copy link
Member

@jay jay commented on 9363f1a Nov 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Fixed in ee96ffa.

Please sign in to comment.