Skip to contentSkip to conversation

Fix a building error at pthread_join cases.

PATCH In review Peng Haitao 2 participants 2 messages Jan 13, 2011 – Jan 14, 2011

lore
Share & tools
lore

Peng Haitao

author
#0 lore raw

PATCH 1/1 Fix a building error at pthread_join cases.

Hi Garrett,

Fix building error of pthread_join cases.

Signed-off-by Peng Haitao <[email protected]>
---
 .../interfaces/pthread_join/threads_scenarii.c     |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c +1 -2
index 479b28c..ee9ccbb 100644
@@ -225,7 +225,6 @@ void scenar_init()
 
 			if (scenarii[ i ].schedparam == -1)
 				sp.sched_priority = sched_get_priority_min(old);
->>>>>>> origin
 
 			ret = pthread_attr_setschedparam(&scenarii[ i ].ta, &sp);
 

@@ -487,4 +486,4 @@ int main (int argc, char *argv[])
 
 	PASSED;
 }
-#endif
\ No newline at end of file
+#endif
Signature · 17 lines
1.7.0.4

-- 
Best Regards,
Peng Haitao


------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand 
malware threats, the impact they can have on your business, and how you 
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
#1 lore raw
Quoted 23 lines · Peng Haitao

Hi Garrett,

Fix building error of pthread_join cases.

Signed-off-by Peng Haitao <[email protected]>

---
 .../interfaces/pthread_join/threads_scenarii.c     |    3 +--

 1 files changed, 1 insertions(+), 2 deletions(-)
testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c +0 -1
index 479b28c..ee9ccbb 100644
@@ -225,7 +225,6 @@ void scenar_init()
 
                        if (scenarii[ i ].schedparam == -1)
                                sp.sched_priority = sched_get_priority_min(old);
->>>>>>> origin
 
                        ret = pthread_attr_setschedparam(&scenarii[ i ].ta, &sp);

testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c int main (int argc, char *argv[]) · line 489

Quoted 6 lines
testcases/open_posix_testsuite/conformance/interfaces/pthread_join/threads_scenarii.c +1 -1
@@ -487,4 +486,4 @@ int main (int argc, char *argv[])
 
        PASSED;
  }
-#endif
\ No newline at end of file
+#endif

This removes the conflicts marker, but it didn't fix a functional
issue with the change. I'm vetting other files you've noted to fix issues.
Thanks,
-Garrett

------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list