-rename OPAQUE to MY_OPAQUE to avoid symbol conflict on W32

author: Christian Grothoff <christian@grothoff.org> 2013-09-23 13:01:42 +0000
committer: Christian Grothoff <christian@grothoff.org> 2013-09-23 13:01:42 +0000
commit: b06f52c0a5e6f4def4c98e951dead5d8ab491ed8 (patch)
tree: a8c7f34dfe47ce2ff9ad0c218e59462134d3d6b7
parent: 945c5990eac48c6e75b31308fca7dc6e490a4977 (diff)
download: libmicrohttpd-b06f52c0a5e6f4def4c98e951dead5d8ab491ed8.tar.gz
libmicrohttpd-b06f52c0a5e6f4def4c98e951dead5d8ab491ed8.zip
3 files changed, 9 insertions, 9 deletions
diff --git a/src/examples/digest_auth_example.c b/src/examples/digest_auth_example.c
index 4b8fd608..51352022 100644
--- a/src/examples/digest_auth_example.c
+++ b/src/examples/digest_auth_example.c
@@ -30,7 +30,7 @@
 #define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"
-#define OPAQUE_STR "11733b200778ce33060f31c9af70a870ba96ddd4"
+#define MY_OPAQUE_STR "11733b200778ce33060f31c9af70a870ba96ddd4"
 static int
 ahc_echo (void *cls,
@@ -53,7 +53,7 @@ ahc_echo (void *cls,
                                                 DENIED,
                                                 MHD_RESPMEM_PERSISTENT);  
      ret = MHD_queue_auth_fail_response(connection, realm,
-                                         OPAQUE_STR,
+                                         MY_OPAQUE_STR,
                                         response,
                                         MHD_NO);    
      MHD_destroy_response(response);  
@@ -73,7 +73,7 @@ ahc_echo (void *cls,
      if (NULL == response) 
        return MHD_NO;
      ret = MHD_queue_auth_fail_response(connection, realm,
-                                         OPAQUE_STR,
+                                         MY_OPAQUE_STR,
                                         response,
                                         (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);  
      MHD_destroy_response(response);  
diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c
index 4838fc37..926093a3 100644
--- a/src/testcurl/test_digestauth.c
+++ b/src/testcurl/test_digestauth.c
@@ -44,7 +44,7 @@
 #define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"
-#define OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"
+#define MY_OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"
 struct CBC
 {
@@ -88,7 +88,7 @@ ahc_echo (void *cls,
                                                 DENIED,
                                                 MHD_RESPMEM_PERSISTENT);  
      ret = MHD_queue_auth_fail_response(connection, realm,
-                                         OPAQUE,
+                                         MY_OPAQUE,
                                         response,
                                         MHD_NO);    
      MHD_destroy_response(response);  
@@ -108,7 +108,7 @@ ahc_echo (void *cls,
      if (NULL == response) 
        return MHD_NO;
      ret = MHD_queue_auth_fail_response(connection, realm,
-                                         OPAQUE,
+                                         MY_OPAQUE,
                                         response,
                                         (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);  
      MHD_destroy_response(response);  
diff --git a/src/testcurl/test_digestauth_with_arguments.c b/src/testcurl/test_digestauth_with_arguments.c
index fb99fb7a..44137c7b 100644
--- a/src/testcurl/test_digestauth_with_arguments.c
+++ b/src/testcurl/test_digestauth_with_arguments.c
@@ -43,7 +43,7 @@
 #define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"
-#define OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"
+#define MY_OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"
 struct CBC
 {
@@ -87,7 +87,7 @@ ahc_echo (void *cls,
                                                 DENIED,
                                                 MHD_RESPMEM_PERSISTENT);  
      ret = MHD_queue_auth_fail_response(connection, realm,
-                                         OPAQUE,
+                                         MY_OPAQUE,
                                         response,
                                         MHD_NO);    
      MHD_destroy_response(response);  
@@ -107,7 +107,7 @@ ahc_echo (void *cls,
      if (NULL == response) 
        return MHD_NO;
      ret = MHD_queue_auth_fail_response(connection, realm,
-                                         OPAQUE,
+                                         MY_OPAQUE,
                                         response,
                                         (ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);  
      MHD_destroy_response(response);
author	Christian Grothoff <christian@grothoff.org>	2013-09-23 13:01:42 +0000
committer	Christian Grothoff <christian@grothoff.org>	2013-09-23 13:01:42 +0000
commit	b06f52c0a5e6f4def4c98e951dead5d8ab491ed8 (patch)
tree	a8c7f34dfe47ce2ff9ad0c218e59462134d3d6b7
parent	945c5990eac48c6e75b31308fca7dc6e490a4977 (diff)
download	libmicrohttpd-b06f52c0a5e6f4def4c98e951dead5d8ab491ed8.tar.gz libmicrohttpd-b06f52c0a5e6f4def4c98e951dead5d8ab491ed8.zip

diff --git a/src/examples/digest_auth_example.c b/src/examples/digest_auth_example.c index 4b8fd608..51352022 100644 --- a/src/examples/digest_auth_example.c +++ b/src/examples/digest_auth_example.c
@@ -30,7 +30,7 @@
30		30
31	#define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"	31	#define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"
32		32
33	#define OPAQUE_STR "11733b200778ce33060f31c9af70a870ba96ddd4"	33	#define MY_OPAQUE_STR "11733b200778ce33060f31c9af70a870ba96ddd4"
34		34
35	static int	35	static int
36	ahc_echo (void *cls,	36	ahc_echo (void *cls,
@@ -53,7 +53,7 @@ ahc_echo (void *cls,
53	DENIED,	53	DENIED,
54	MHD_RESPMEM_PERSISTENT);	54	MHD_RESPMEM_PERSISTENT);
55	ret = MHD_queue_auth_fail_response(connection, realm,	55	ret = MHD_queue_auth_fail_response(connection, realm,
56	OPAQUE_STR,	56	MY_OPAQUE_STR,
57	response,	57	response,
58	MHD_NO);	58	MHD_NO);
59	MHD_destroy_response(response);	59	MHD_destroy_response(response);
@@ -73,7 +73,7 @@ ahc_echo (void *cls,
73	if (NULL == response)	73	if (NULL == response)
74	return MHD_NO;	74	return MHD_NO;
75	ret = MHD_queue_auth_fail_response(connection, realm,	75	ret = MHD_queue_auth_fail_response(connection, realm,
76	OPAQUE_STR,	76	MY_OPAQUE_STR,
77	response,	77	response,
78	(ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);	78	(ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);
79	MHD_destroy_response(response);	79	MHD_destroy_response(response);


diff --git a/src/testcurl/test_digestauth.c b/src/testcurl/test_digestauth.c index 4838fc37..926093a3 100644 --- a/src/testcurl/test_digestauth.c +++ b/src/testcurl/test_digestauth.c
@@ -44,7 +44,7 @@
44		44
45	#define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"	45	#define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"
46		46
47	#define OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"	47	#define MY_OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"
48		48
49	struct CBC	49	struct CBC
50	{	50	{
@@ -88,7 +88,7 @@ ahc_echo (void *cls,
88	DENIED,	88	DENIED,
89	MHD_RESPMEM_PERSISTENT);	89	MHD_RESPMEM_PERSISTENT);
90	ret = MHD_queue_auth_fail_response(connection, realm,	90	ret = MHD_queue_auth_fail_response(connection, realm,
91	OPAQUE,	91	MY_OPAQUE,
92	response,	92	response,
93	MHD_NO);	93	MHD_NO);
94	MHD_destroy_response(response);	94	MHD_destroy_response(response);
@@ -108,7 +108,7 @@ ahc_echo (void *cls,
108	if (NULL == response)	108	if (NULL == response)
109	return MHD_NO;	109	return MHD_NO;
110	ret = MHD_queue_auth_fail_response(connection, realm,	110	ret = MHD_queue_auth_fail_response(connection, realm,
111	OPAQUE,	111	MY_OPAQUE,
112	response,	112	response,
113	(ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);	113	(ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);
114	MHD_destroy_response(response);	114	MHD_destroy_response(response);


diff --git a/src/testcurl/test_digestauth_with_arguments.c b/src/testcurl/test_digestauth_with_arguments.c index fb99fb7a..44137c7b 100644 --- a/src/testcurl/test_digestauth_with_arguments.c +++ b/src/testcurl/test_digestauth_with_arguments.c
@@ -43,7 +43,7 @@
43		43
44	#define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"	44	#define DENIED "<html><head><title>libmicrohttpd demo</title></head><body>Access denied</body></html>"
45		45
46	#define OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"	46	#define MY_OPAQUE "11733b200778ce33060f31c9af70a870ba96ddd4"
47		47
48	struct CBC	48	struct CBC
49	{	49	{
@@ -87,7 +87,7 @@ ahc_echo (void *cls,
87	DENIED,	87	DENIED,
88	MHD_RESPMEM_PERSISTENT);	88	MHD_RESPMEM_PERSISTENT);
89	ret = MHD_queue_auth_fail_response(connection, realm,	89	ret = MHD_queue_auth_fail_response(connection, realm,
90	OPAQUE,	90	MY_OPAQUE,
91	response,	91	response,
92	MHD_NO);	92	MHD_NO);
93	MHD_destroy_response(response);	93	MHD_destroy_response(response);
@@ -107,7 +107,7 @@ ahc_echo (void *cls,
107	if (NULL == response)	107	if (NULL == response)
108	return MHD_NO;	108	return MHD_NO;
109	ret = MHD_queue_auth_fail_response(connection, realm,	109	ret = MHD_queue_auth_fail_response(connection, realm,
110	OPAQUE,	110	MY_OPAQUE,
111	response,	111	response,
112	(ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);	112	(ret == MHD_INVALID_NONCE) ? MHD_YES : MHD_NO);
113	MHD_destroy_response(response);	113	MHD_destroy_response(response);